diff --git a/src/server/scripts/Pet/pet_mage.cpp b/src/server/scripts/Pet/pet_mage.cpp
index 39266cc38..20e3ae8b4 100644
--- a/src/server/scripts/Pet/pet_mage.cpp
+++ b/src/server/scripts/Pet/pet_mage.cpp
@@ -154,8 +154,13 @@ class npc_pet_mage_mirror_image : public CreatureScript
                     {
                         me->getThreatManager().resetAllAggro();
                         me->AddThreat(selection, 1000000.0f);
-                        AttackStart(selection);
+
+                        if (owner->IsInCombat())
+                            AttackStart(selection);
                     }
+
+                    if (!owner->IsInCombat() && !me->GetVictim())
+                        EnterEvadeMode();
                 }
             }
 
@@ -171,9 +176,6 @@ class npc_pet_mage_mirror_image : public CreatureScript
                 if (events.GetTimer() < 1200)
                     return;
 
-                if (!me->GetVictim() || !me->GetVictim()->IsAlive())
-                    EnterEvadeMode();
-
                 if (!me->IsInCombat() || !me->GetVictim())
                 {
                     MySelectNextTarget();