diff --git a/[esx]/es_extended/client/main.lua b/[esx]/es_extended/client/main.lua
index c7ce21af..b613f741 100644
--- a/[esx]/es_extended/client/main.lua
+++ b/[esx]/es_extended/client/main.lua
@@ -13,6 +13,10 @@ CreateThread(function()
 	end
 end)
 
+RegisterNetEvent("esx:requestModel", function(model)
+    ESX.Streaming.RequestModel(model)
+end)
+
 RegisterNetEvent('esx:playerLoaded')
 AddEventHandler('esx:playerLoaded', function(xPlayer, isNew, skin)
 	ESX.PlayerData = xPlayer
diff --git a/[esx]/es_extended/server/onesync.lua b/[esx]/es_extended/server/onesync.lua
index 424f6ea8..67a629d1 100644
--- a/[esx]/es_extended/server/onesync.lua
+++ b/[esx]/es_extended/server/onesync.lua
@@ -62,23 +62,21 @@ end
 ---@param Properties table
 ---@param cb function
 function ESX.OneSync.SpawnVehicle(model, coords, heading, Properties, cb)
-	model = type(model) == 'string' and joaat(model) or model
-	Properties = Properties or {}
-	local vector = type(coords) == "vector3" and coords or vec(coords.x, coords.y, coords.z)
-	CreateThread(function()
-		local player = nil
-		for _, playerId in ipairs(GetPlayers()) do
-				ESX.GetVehicleType(model, playerId, function(Type)
-					local SpawnedEntity = CreateVehicleServerSetter(model, Type, vector, heading)
-					Wait(250)
-					local NetworkId = NetworkGetNetworkIdFromEntity(SpawnedEntity)
-					Properties.NetId = NetworkId
-					Entity(SpawnedEntity).state:set('VehicleProperties', Properties, true)
-					cb(NetworkId)
-				end)
-				break
-		end
-	end)
+    model = type(model) == 'string' and joaat(model) or model
+    Properties = Properties or {}
+    local vector = type(coords) == "vector3" and coords or vec(coords.x, coords.y, coords.z)
+    TriggerClientEvent("esx:requestModel", -1, model)
+    CreateThread(function()
+        local xPlayer = ESX.OneSync.GetClosestPlayer(vector, 200)
+        ESX.GetVehicleType(model, xPlayer.id, function(Type)
+            local SpawnedEntity = CreateVehicleServerSetter(model, Type, vector, heading)
+            Wait(250)
+            local NetworkId = NetworkGetNetworkIdFromEntity(SpawnedEntity)
+            Properties.NetId = NetworkId
+            Entity(SpawnedEntity).state:set('VehicleProperties', Properties, true)
+            cb(NetworkId)
+        end)
+    end)
 end