diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp
index d5b924e4a1..9c395a2319 100755
--- a/src/server/game/Maps/Map.cpp
+++ b/src/server/game/Maps/Map.cpp
@@ -648,7 +648,10 @@ void Map::RemovePlayerFromMap(Player* player, bool remove)
     SendRemoveTransports(player);
 
     player->UpdateObjectVisibility(true);
-    player->RemoveFromGrid();
+    if (player->IsInGrid())
+        player->RemoveFromGrid();
+    else
+        ASSERT(remove); //maybe deleted in logoutplayer when player is not in a map
 
     if (remove)
         DeleteFromWorld(player);