diff --git a/Source/Game/Entities/Vehicle.cs b/Source/Game/Entities/Vehicle.cs
index 7c891fd61..e7767bcf4 100644
--- a/Source/Game/Entities/Vehicle.cs
+++ b/Source/Game/Entities/Vehicle.cs
@@ -661,7 +661,9 @@ namespace Game.Entities
                 }
             }
 
-            Passenger.InterruptNonMeleeSpells(false);
+            Passenger.InterruptSpell(CurrentSpellTypes.Generic);
+            Passenger.InterruptSpell(CurrentSpellTypes.AutoRepeat);
+            Passenger.RemoveAurasWithInterruptFlags(SpellAuraInterruptFlags.Mount);
             Passenger.RemoveAurasByType(AuraType.Mounted);
 
             VehicleSeatRecord veSeat = Seat.Value.SeatInfo;