diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 28c6240ce4..52dcb7915d 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -16358,6 +16358,9 @@ void Unit::EnterVehicle(Vehicle *vehicle, int8 seatId)
 
     if (GetTypeId() == TYPEID_PLAYER)
     {
+        if(this->ToPlayer()->isInCombat())
+            return;
+
         this->ToPlayer()->InterruptNonMeleeSpells(false);
         this->ToPlayer()->StopCastingCharm();
         this->ToPlayer()->StopCastingBindSight();