diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 8a3a4bffd..a56dba641 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -1844,11 +1844,11 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati
                 }
                 GetSession()->SendPacket( &data );
                 SendSavedInstances();
-
-                // remove from old map now
-                if(oldmap) oldmap->Remove(this, false);
             }
 
+            // remove from old map now
+            if(oldmap) oldmap->Remove(this, false);
+
             // new final coordinates
             float final_x = x;
             float final_y = y;