1 files changed, 6 insertions, 1 deletions
diff --git a/src/server/game/AI/CreatureAIImpl.h b/src/server/game/AI/CreatureAIImpl.h
index 4619c6f9f79..cc3bfad4f86 100755
--- a/src/server/game/AI/CreatureAIImpl.h
+++ b/src/server/game/AI/CreatureAIImpl.h
@@ -549,8 +549,13 @@ inline bool CreatureAI::_EnterEvadeMode()
     if (!me->isAlive())
         return false;
 
+    // call specialized vehicle remove auras if creature is one
+    if (!me->IsVehicle())
+        me->RemoveAllAuras();
+    else
+        me->RemoveAllAurasExceptVehicle();
+
     // sometimes bosses stuck in combat?
-    me->RemoveAllAuras();
     me->DeleteThreatList();
     me->CombatStop(true);
     me->LoadCreaturesAddon();