diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
index 32b027820..a0d2871bb 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
@@ -471,8 +471,12 @@ struct boss_kiljaeden : public BossAI
     {
         if (me->GetReactState() == REACT_PASSIVE)
             return;
+
         ScriptedAI::EnterEvadeMode(why);
-        me->DespawnOrUnsummon();
+        if (InstanceScript* instance = me->GetInstanceScript())
+            if (Creature* controller = instance->GetCreature(DATA_KJ_CONTROLLER))
+                if (controller->IsAIEnabled)
+                    controller->AI()->Reset();
     }
 
     void AttackStart(Unit* who) override