diff --git a/api/src/main/java/com/bartlomiejpluta/base/util/world/Warp.java b/api/src/main/java/com/bartlomiejpluta/base/util/world/Warp.java
index 8b8eeccb..4b1b8e5b 100644
--- a/api/src/main/java/com/bartlomiejpluta/base/util/world/Warp.java
+++ b/api/src/main/java/com/bartlomiejpluta/base/util/world/Warp.java
@@ -35,6 +35,11 @@ public class Warp extends EntityDelegate {
    public void update(float dt) {
       if (entity != null && entity.getCoordinates().equals(getCoordinates())) {
          beforeWarp();
+
+         if(entity.getLayer() != null) {
+            entity.getLayer().removeEntity(entity);
+         }
+
          context.openMap(mapUid);
          context.getMap().getObjectLayer(layer).addEntity(entity);
          entity.setCoordinates(x, y);