diff --git a/Source/Game/Handlers/MovementHandler.cs b/Source/Game/Handlers/MovementHandler.cs
index 5d47b91ce..8f03b6374 100644
--- a/Source/Game/Handlers/MovementHandler.cs
+++ b/Source/Game/Handlers/MovementHandler.cs
@@ -86,6 +86,9 @@ namespace Game
                 return;
             }
 
+            if (!mover.MoveSpline.Finalized())
+                return;
+
             // stop some emotes at player move
             if (plrMover && (plrMover.GetEmoteState() != 0))
                 plrMover.SetEmoteState(Emote.OneshotNone);