diff --git a/src/game/MovementHandler.cpp b/src/game/MovementHandler.cpp
index 0920e2a3ca..77dd820d84 100644
--- a/src/game/MovementHandler.cpp
+++ b/src/game/MovementHandler.cpp
@@ -625,7 +625,11 @@ void WorldSession::HandleChangeSeatsOnControlledVehicle(WorldPacket &recv_data)
 
             if (vehicle_base->GetGUID() == guid)
                 GetPlayer()->ChangeSeat(seatId);
-        }
+            else if (Unit *vehUnit = Unit::GetUnit(*GetPlayer(), guid))
+                if (Vehicle *vehicle = vehUnit->GetVehicleKit())
+                    if (vehicle->HasEmptySeat(seatId))
+                        GetPlayer()->EnterVehicle(vehicle, seatId);
+		}
         break;
     default:
         break;