1 files changed, 1 insertions, 2 deletions
diff --git a/src/game/Map.cpp b/src/game/Map.cpp
index 6934bcf3df1..2e81d651d8b 100644
--- a/src/game/Map.cpp
+++ b/src/game/Map.cpp
@@ -844,10 +844,9 @@ Map::Remove(T *obj, bool remove)
     NGridType *grid = getNGrid(cell.GridX(), cell.GridY());
     assert( grid != NULL );
 
+    obj->RemoveFromWorld();
     if(obj->isActiveObject())
         RemoveFromActive(obj);
-
-    obj->RemoveFromWorld();
     RemoveFromGrid(obj,grid,cell);
 
     UpdateObjectVisibility(obj,cell,p);