1 files changed, 3 insertions, 1 deletions
diff --git a/src/game/Map.cpp b/src/game/Map.cpp
index 4f0ecb1d26a..f58086ccec6 100644
--- a/src/game/Map.cpp
+++ b/src/game/Map.cpp
@@ -818,10 +818,12 @@ void Map::Remove(Player *player, bool remove)
 
         // invalid coordinates
         player->RemoveFromWorld();
-        player->ResetMap();
 
         if( remove )
+        {
             DeleteFromWorld(player);
+            player->ResetMap();
+        }
 
         return;
     }