diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index b2fbaf6a9c3..7692ed67ec1 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -14350,10 +14350,10 @@ bool Unit::SetCanFly(bool enable, bool packetOnly)
         }
         else
         {
+            if (IsFlying() && !IsLevitating())
+                SetFall(true);
             RemoveUnitMovementFlag(MOVEMENTFLAG_CAN_FLY | MOVEMENTFLAG_MASK_MOVING_FLY);
             RemoveExtraUnitMovementFlag(MOVEMENTFLAG2_CAN_SWIM_TO_FLY_TRANS);
-            if (!IsLevitating())
-                SetFall(true);
         }
     }