diff --git a/Source/Game/Entities/Creature/CreatureGroups.cs b/Source/Game/Entities/Creature/CreatureGroups.cs
index 704700012..4a2f48c13 100644
--- a/Source/Game/Entities/Creature/CreatureGroups.cs
+++ b/Source/Game/Entities/Creature/CreatureGroups.cs
@@ -286,7 +286,7 @@ namespace Game.Entities
                 float angle = formationInfo.FollowAngle + MathF.PI; // for some reason, someone thought it was a great idea to invert relativ angles...
                 float dist = formationInfo.FollowDist;
 
-                if (!member.HasUnitState(UnitState.FollowFormation))
+                if (member.GetMotionMaster().GetCurrentMovementGeneratorType(MovementSlot.Default) != MovementGeneratorType.Formation)
                     member.GetMotionMaster().MoveFormation(_leader, dist, angle, formationInfo.LeaderWaypointIDs[0], formationInfo.LeaderWaypointIDs[1]);
             }
         }