diff --git a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
index 7b86af01cbf..84a1871a5c1 100644
--- a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
@@ -567,6 +567,9 @@ void WaypointMovementGenerator<Creature>::StartMove(Creature* owner, bool relaun
     if (_speed)
         init.SetVelocity(*_speed);
 
+    if (IsExactSplinePath() && points.size() > 2 && owner->CanFly())
+        init.SetSmooth();
+
     Milliseconds duration(init.Launch());
 
     if (!IsExactSplinePath()