diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 07a62e97a2..4fa18fa260 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -15945,7 +15945,7 @@ void Unit::BuildMovementPacket(ByteBuffer *data) const
     {
         case TYPEID_UNIT:
             if (canFly())
-                const_cast<Unit*>(this)->AddUnitMovementFlag(MOVEMENTFLAG_FORWARD | MOVEMENTFLAG_LEVITATING);
+                const_cast<Unit*>(this)->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
             break;
         case TYPEID_PLAYER:
             // remove unknown, unused etc flags for now
diff --git a/src/game/WaypointMovementGenerator.cpp b/src/game/WaypointMovementGenerator.cpp
index 2437f5d48e..a31afaa5b1 100644
--- a/src/game/WaypointMovementGenerator.cpp
+++ b/src/game/WaypointMovementGenerator.cpp
@@ -86,6 +86,10 @@ void WaypointMovementGenerator<Creature>::InitTraveller(Creature &unit, const Wa
     unit.SetUInt32Value(UNIT_NPC_EMOTESTATE, 0);
     unit.SetUInt32Value(UNIT_FIELD_BYTES_1, 0);
 
+    // TODO: make this part of waypoint node, so that creature can walk when desired?
+    if (unit.canFly())
+        SetByteFlag(UNIT_FIELD_BYTES_1, 3, 0x02);
+
     unit.addUnitState(UNIT_STAT_ROAMING);
 }