diff --git a/client/main.lua b/client/main.lua
index 5c8be801..8e7d3a4a 100644
--- a/client/main.lua
+++ b/client/main.lua
@@ -267,13 +267,19 @@ AddEventHandler('esx:setJob', function(job)
 end)
 
 RegisterNetEvent('esx:spawnVehicle')
-AddEventHandler('esx:spawnVehicle', function(model)
-	local playerPed = PlayerPedId()
-	local coords    = GetEntityCoords(playerPed)
+AddEventHandler('esx:spawnVehicle', function(vehicle)
+	local model = (type(vehicle) == 'number' and vehicle or GetHashKey(vehicle))
 
-	ESX.Game.SpawnVehicle(model, coords, 90.0, function(vehicle)
-		TaskWarpPedIntoVehicle(playerPed,  vehicle, -1)
-	end)
+	if IsModelInCdimage(model) then
+		local playerPed = PlayerPedId()
+		local coords    = GetEntityCoords(playerPed)
+	
+		ESX.Game.SpawnVehicle(model, coords, 90.0, function(vehicle)
+			TaskWarpPedIntoVehicle(playerPed, vehicle, -1)
+		end)
+	else
+		TriggerEvent('chat:addMessage', { args = { '^1SYSTEM', 'Invalid vehicle model.' } })
+	end
 end)
 
 RegisterNetEvent('esx:pickup')
diff --git a/client/modules/streaming.lua b/client/modules/streaming.lua
index 143d0c0c..69fffe72 100644
--- a/client/modules/streaming.lua
+++ b/client/modules/streaming.lua
@@ -1,7 +1,7 @@
 function ESX.Streaming.RequestModel(modelHash, cb)
 	modelHash = (type(modelHash) == 'number' and modelHash or GetHashKey(modelHash))
 
-	if not HasModelLoaded(modelHash) then
+	if not HasModelLoaded(modelHash) and IsModelInCdimage(modelHash) then
 		RequestModel(modelHash)
 
 		while not HasModelLoaded(modelHash) do