diff --git a/Source/Game/Entities/Vehicle.cs b/Source/Game/Entities/Vehicle.cs
index dadd1f25d..be2e7e338 100644
--- a/Source/Game/Entities/Vehicle.cs
+++ b/Source/Game/Entities/Vehicle.cs
@@ -574,6 +574,11 @@ namespace Game.Entities
                 return true;
             }
 
+            //It's possible that multiple vehicle join
+            //events are executed in the same update
+            if (Passenger.GetVehicle() != null)
+                Passenger.ExitVehicle();
+
             Passenger.SetVehicle(Target);
             Seat.Value.Passenger.Guid = Passenger.GetGUID();
             Seat.Value.Passenger.IsUnselectable = Passenger.HasUnitFlag(UnitFlags.NotSelectable);