diff --git a/src/main/java/com/yes/yes/managers/PlayerManager.java b/src/main/java/com/yes/yes/managers/PlayerManager.java
index eb77234..29a79dd 100644
--- a/src/main/java/com/yes/yes/managers/PlayerManager.java
+++ b/src/main/java/com/yes/yes/managers/PlayerManager.java
@@ -60,7 +60,6 @@ public class PlayerManager {
             Entity oldEntity = chunk.getEntity(blockCoordinate);
 
             if(oldEntity != null && oldEntity.getClass().getSimpleName() == entity.getClass().getSimpleName()) {
-                oldEntity.setData("destroyed", true);
                 entity.setRotation(oldEntity.getRotation() + 1);
             }
 
diff --git a/src/main/java/com/yes/yes/world/Chunk.java b/src/main/java/com/yes/yes/world/Chunk.java
index e1b3e13..46107ec 100644
--- a/src/main/java/com/yes/yes/world/Chunk.java
+++ b/src/main/java/com/yes/yes/world/Chunk.java
@@ -45,6 +45,7 @@ public class Chunk extends GridPane {
 
     public void removeEntity(Coordinate pos) {
         Entity entity = getEntity(pos);
+        entity.setData("destroyed", true);
         this.getChildren().remove(entity);
         data[pos.x + pos.y * CHUNK_SIZE] = null;
     }