diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp
index b8ef8886433..23b81dd4b6f 100644
--- a/src/server/game/Movement/MotionMaster.cpp
+++ b/src/server/game/Movement/MotionMaster.cpp
@@ -152,10 +152,10 @@ void MotionMaster::MovementExpired(bool reset /*= true*/)
 
 MovementSlot MotionMaster::GetCurrentSlot() const
 {
-    if (empty() || !top())
+    if (empty() || (_slot[MOTION_SLOT_IDLE] && !_slot[MOTION_SLOT_ACTIVE]))
         return MOTION_SLOT_IDLE;
 
-    if (top())
+    if (_slot[MOTION_SLOT_ACTIVE])
         return MOTION_SLOT_ACTIVE;
 
     return MAX_MOTION_SLOT;