diff --git a/src/server/game/AI/SmartScripts/SmartAI.cpp b/src/server/game/AI/SmartScripts/SmartAI.cpp
index be65d9d4d9..15f5b06d55 100644
--- a/src/server/game/AI/SmartScripts/SmartAI.cpp
+++ b/src/server/game/AI/SmartScripts/SmartAI.cpp
@@ -524,7 +524,7 @@ void SmartAI::MoveInLineOfSight(Unit* who)
     if (!IsAIControlled())
         return;
 
-    if (AssistPlayerInCombatAgainst(who))
+    if (HasEscortState(SMART_ESCORT_ESCORTING) && AssistPlayerInCombatAgainst(who))
         return;
 
     CreatureAI::MoveInLineOfSight(who);