diff --git a/Source/Game/Entities/Unit/Unit.Movement.cs b/Source/Game/Entities/Unit/Unit.Movement.cs
index c2975d984..8e3de302a 100644
--- a/Source/Game/Entities/Unit/Unit.Movement.cs
+++ b/Source/Game/Entities/Unit/Unit.Movement.cs
@@ -1841,7 +1841,7 @@ namespace Game.Entities
                     return;
             }
 
-            if (HasUnitState(UnitState.CannotTurn))
+            if (HasUnitState(UnitState.LostControl | UnitState.Focusing))
                 loc.W = GetOrientation();
 
             UpdatePosition(loc.X, loc.Y, loc.Z, loc.W);