diff --git a/client/events.lua b/client/events.lua
index b720f59..60fae33 100644
--- a/client/events.lua
+++ b/client/events.lua
@@ -160,6 +160,12 @@ end)
 
 RegisterNetEvent('QBCore:Client:VehicleInfo', function(info)
     local plate = QBCore.Functions.GetPlate(info.vehicle)
+    local hasKeys = true
+
+    if GetResourceState('qb-vehiclekeys') == 'started' then
+        hasKeys = exports['qb-vehiclekeys']:HasKeys()
+    end
+
     local data = {
         vehicle = info.vehicle,
         seat = info.seat,
@@ -167,8 +173,9 @@ RegisterNetEvent('QBCore:Client:VehicleInfo', function(info)
         plate = plate,
         driver = GetPedInVehicleSeat(info.vehicle, -1),
         inseat = GetPedInVehicleSeat(info.vehicle, info.seat),
-        haskeys = exports['qb-vehiclekeys']:HasKeys(plate)
+        haskeys = hasKeys
     }
+
     TriggerEvent('QBCore:Client:'..info.event..'Vehicle', data)
 end)