diff --git a/scripts/server/vehicle.js b/scripts/server/vehicle.js
index c66bd1b0..26675ce1 100644
--- a/scripts/server/vehicle.js
+++ b/scripts/server/vehicle.js
@@ -1152,13 +1152,15 @@ function respawnVehicle(vehicle) {
 function spawnVehicle(vehicleData) {
 	logToConsole(LOG_DEBUG, `[VRR.Vehicle]: Spawning ${getVehicleNameFromModel(vehicleData.model)} at ${vehicleData.spawnPosition.x}, ${vehicleData.spawnPosition.y}, ${vehicleData.spawnPosition.z} with heading ${vehicleData.spawnRotation}`);
 	let vehicle = createGameVehicle(vehicleData.model, vehicleData.spawnPosition, vehicleData.spawnRotation);
-	setVehicleHeading(vehicle, vehicleData.spawnRotation)
-	addToWorld(vehicle);
 
 	if(!vehicle) {
 		return false;
 	}
 
+	setVehicleHeading(vehicle, vehicleData.spawnRotation)
+	addToWorld(vehicle);
+	vehicleData.vehicle = vehicle;
+
 	if(isGameFeatureSupported("vehicleColours")) {
 		if(vehicleData.colour1IsRGBA && vehicleData.colour2IsRGBA) {
 			vehicle.setRGBColours(vehicleData.colour1RGBA, vehicleData.colour2RGBA);
@@ -1187,9 +1189,7 @@ function spawnVehicle(vehicleData) {
 
 	setElementDimension(vehicle, vehicleData.dimension);
 
-	vehicleData.vehicle = vehicle;
-
-	setVehicleHealth(vehicle, 1000);
+	//setVehicleHealth(vehicle, 1000);
 	repairVehicle(vehicle);
 
 	setEntityData(vehicle, "vrr.livery", vehicleData.livery, true);