diff --git a/server/vehicle.lua b/server/vehicle.lua
index e4844b9..2cafc5d 100644
--- a/server/vehicle.lua
+++ b/server/vehicle.lua
@@ -210,14 +210,7 @@ function NDCore.giveVehicleAccess(source, vehicle, access, info)
             vehNetId = netId
         })
     elseif not access and hasKey then
-        ox_inventory:RemoveItem(source, "keys", 1, {
-            vehOwner = owner or state.owner,
-            vehId = vehicleId,
-            vehPlate = plate,
-            vehModel = modelName,
-            keyEnabled = true,
-            vehNetId = netId
-        })
+        ox_inventory:RemoveItem(source, "keys", 1, nil, hasKey)
     end
 end
 
@@ -639,6 +632,11 @@ RegisterNetEvent("ND_Vehicles:storeVehicle", function(netId)
         position = "bottom",
         duration = 3000
     })
+    NDCore.giveVehicleAccess(src, vehicle.entity, false, {
+        vehicleId = vehicle.id,
+        netId = vehicle.netId,
+        owner = vehicle.owner
+    })
 end)
 
 local function isParkingAvailable(locations)