diff --git a/src/scripts/eastern_kingdoms/redridge_mountains/redridge_mountains.cpp b/src/scripts/eastern_kingdoms/redridge_mountains/redridge_mountains.cpp
index a06d99b2676..228d1d19cde 100644
--- a/src/scripts/eastern_kingdoms/redridge_mountains/redridge_mountains.cpp
+++ b/src/scripts/eastern_kingdoms/redridge_mountains/redridge_mountains.cpp
@@ -63,6 +63,21 @@ struct npc_corporal_keeshan_escortAI : npc_escortAI
         m_uiShieldBashTimer  = 8000;
     }
 
+    void JustRespawned() override
+    {
+        // Reset EscortAI
+        npc_escortAI::JustRespawned();
+        Reset(); 
+
+        //Reset Faction and Quest Giver Flag
+        m_creature->SetFactionTemplateId(FACTION_STORMWIND);
+        m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
+
+        // Clear Movement
+        m_creature->GetMotionMaster()->Clear();
+        m_creature->GetMotionMaster()->MoveTargetedHome();
+    }
+
     void WaypointStart(uint32 uiWP) override
     {
         switch (uiWP)