diff --git a/FFXIVClassic Map Server/WorldManager.cs b/FFXIVClassic Map Server/WorldManager.cs
index a9b03e08..5e728a01 100644
--- a/FFXIVClassic Map Server/WorldManager.cs	
+++ b/FFXIVClassic Map Server/WorldManager.cs	
@@ -474,6 +474,10 @@ namespace FFXIVClassic_Map_Server
 
             player.SendZoneInPackets(this, spawnType);
 
+            player.destinationZone = 0;
+            player.destinationSpawnType = 0;
+            Database.SavePlayerPosition(player);
+
             player.playerSession.LockUpdates(false);
 
             LuaEngine.OnZoneIn(player);