diff --git a/Source/Game/AI/CoreAI/PassiveAI.cs b/Source/Game/AI/CoreAI/PassiveAI.cs
index b014808aa..1513316fc 100644
--- a/Source/Game/AI/CoreAI/PassiveAI.cs
+++ b/Source/Game/AI/CoreAI/PassiveAI.cs
@@ -31,7 +31,7 @@ namespace Game.AI
 
         public override void UpdateAI(uint diff)
         {
-            if (me.IsInCombat() && me.GetAttackers().Empty())
+            if (me.IsEngaged() && !me.IsInCombat())
                 EnterEvadeMode(EvadeReason.NoHostiles);
         }