diff --git a/Source/Game/Movement/Generators/WaypointMovement.cs b/Source/Game/Movement/Generators/WaypointMovement.cs
index 145f52fd8..27497ed1b 100644
--- a/Source/Game/Movement/Generators/WaypointMovement.cs
+++ b/Source/Game/Movement/Generators/WaypointMovement.cs
@@ -396,7 +396,7 @@ namespace Game.Movement
             //! but formationDest contains global coordinates
             init.MoveTo(waypoint.x, waypoint.y, waypoint.z, _generatePath);
 
-            if (waypoint.orientation.HasValue && waypoint.delay != 0)
+            if (waypoint.orientation.HasValue && (waypoint.delay > 0 || _currentNode == _path.nodes.Count - 1))
                 init.SetFacing(waypoint.orientation.Value);
 
             switch (waypoint.moveType)