1 files changed, 3 insertions, 3 deletions
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index e8955a18124..fbd3444bd5d 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -12964,6 +12964,9 @@ void Unit::RemoveFromWorld()
 
 void Unit::CleanupsBeforeDelete()
 {
+    if (IsInWorld())
+        RemoveFromWorld();
+
     assert(GetGUID());
 
     //A unit may be in removelist and not in world, but it is still in grid
@@ -12977,9 +12980,6 @@ void Unit::CleanupsBeforeDelete()
     DeleteThreatList();
     getHostilRefManager().setOnlineOfflineState(false);
     GetMotionMaster()->Clear(false);                    // remove different non-standard movement generators.
-
-    if (IsInWorld())
-        RemoveFromWorld();
 }
 
 void Unit::UpdateCharmAI()