diff --git a/Source/Game/Movement/Generators/WaypointMovement.cs b/Source/Game/Movement/Generators/WaypointMovement.cs
index 0e3230ef5..a491db71c 100644
--- a/Source/Game/Movement/Generators/WaypointMovement.cs
+++ b/Source/Game/Movement/Generators/WaypointMovement.cs
@@ -54,6 +54,10 @@ namespace Game.Movement
         {
             if (timer != 0)
             {
+                // Don't try to paused an already paused generator
+                if (HasFlag(MovementGeneratorFlags.Paused))
+                    return;
+
                 AddFlag(MovementGeneratorFlags.TimedPaused);
                 _nextMoveTime.Reset((int)timer);
                 RemoveFlag(MovementGeneratorFlags.Paused);