diff --git a/src/server/game/AI/SmartScripts/SmartAI.cpp b/src/server/game/AI/SmartScripts/SmartAI.cpp
index af6bf6cf6c..1755c36562 100644
--- a/src/server/game/AI/SmartScripts/SmartAI.cpp
+++ b/src/server/game/AI/SmartScripts/SmartAI.cpp
@@ -436,7 +436,9 @@ void SmartAI::EnterEvadeMode()
     if (!me->isAlive())
         return;
 
-    me->RemoveAllAuras();
+    // Vehicles should not dismount their passengers on evade mode
+    me->RemoveAllAurasExceptType(SPELL_AURA_CONTROL_VEHICLE);
+    
     me->DeleteThreatList();
     me->CombatStop(true);
     me->LoadCreaturesAddon();