diff --git a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
index 4f6afd80f4e..ef4dcc086e4 100755
--- a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
@@ -232,6 +232,13 @@ void WaypointMovementGenerator<Creature>::StartMove(Creature* creature, bool rel
             break;
     }
 
+    if (creature->CanFly())
+    {
+        init.SetFly();
+        init.SetSmooth();
+        init.SetUncompressed();
+    }
+
     if (waypoint.Velocity > 0.f)
         init.SetVelocity(waypoint.Velocity);