diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 8bf2968fd40..1face06a8c1 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -11045,10 +11045,9 @@ void Unit::CleanupsBeforeDelete()
         RemoveAllAuras();
         RemoveAllGameObjects();
         RemoveAllDynObjects();
-        GetMotionMaster()->Clear(false);                    // remove different non-standard movement generators.
-
         UnpossessSelf(false);
         RemoveAllFromVision();
+        GetMotionMaster()->Clear(false);                    // remove different non-standard movement generators.
     }
     RemoveFromWorld();
 }