diff --git a/Source/Game/Entities/Player/Player.cs b/Source/Game/Entities/Player/Player.cs
index 6acdc5e94..9bf6665c3 100644
--- a/Source/Game/Entities/Player/Player.cs
+++ b/Source/Game/Entities/Player/Player.cs
@@ -753,9 +753,6 @@ namespace Game.Entities
                     GetName(), viewpoint.GetEntry(), viewpoint.GetTypeId());
                 SetViewpoint(viewpoint, false);
             }
-
-            RemovePlayerLocalFlag(PlayerLocalFlags.OverrideTransportServerTime);
-            SetTransportServerTime(0);
         }
 
         void ScheduleDelayedOperation(PlayerDelayedOperations operation)
@@ -2178,6 +2175,9 @@ namespace Game.Entities
                     }
 
                     SendPacket(transferPending);
+
+                    RemovePlayerLocalFlag(PlayerLocalFlags.OverrideTransportServerTime);
+                    SetTransportServerTime(0);
                 }
 
                 // remove from old map now