diff --git a/client/main.lua b/client/main.lua
index bd4c02e..d0c17d6 100644
--- a/client/main.lua
+++ b/client/main.lua
@@ -119,6 +119,8 @@ local function startMove(netid, direction, pedid)
     remotepush = true
     while remotepush do
         Wait(0)
+        if GetVehicleDoorLockStatus(vehicle) > 1 then return end
+        if GetPedInVehicleSeat(vehicle, -1) > 0 then return end
         if IsEntityInAir(vehicle) or IsEntityUpsidedown(vehicle) or IsEntityAttachedToAnyVehicle(remoteped) == false then
             remotepush = false
             return TriggerServerEvent('OT_pushvehicle:detach', netid)