diff --git a/scripts/client/event.js b/scripts/client/event.js
index 983cf904..ae41496a 100644
--- a/scripts/client/event.js
+++ b/scripts/client/event.js
@@ -208,11 +208,12 @@ function onPedEnteredVehicle(event, ped, vehicle, seat) {
 		if (ped == localPlayer) {
 			if (areServerElementsSupported()) {
 				if (inVehicleSeat == 0) {
-					setVehicleEngine(vehicle.id, false);
-					//setLocalPlayerControlState(false, false);
-					if (!inVehicle.engine) {
-						parkedVehiclePosition = inVehicle.position;
-						parkedVehicleHeading = inVehicle.heading;
+					//parkedVehiclePosition = inVehicle.position;
+					//parkedVehicleHeading = inVehicle.heading;
+					if (doesEntityDataExist(vehicle, "agrp.server") == true) {
+						setVehicleEngine(vehicle.id, false);
+						setVehicleEngine(vehicle.id, getEntityData(vehicle, "agrp.engine"));
+						//setLocalPlayerControlState(false, false);
 					}
 				}
 			}