diff --git a/resources/[jobs]/[civ]/mh_jobgarage/client/chiefsettings.lua b/resources/[jobs]/[civ]/mh_jobgarage/client/chiefsettings.lua
index 9f30c1e16..3db7e0f4f 100644
--- a/resources/[jobs]/[civ]/mh_jobgarage/client/chiefsettings.lua
+++ b/resources/[jobs]/[civ]/mh_jobgarage/client/chiefsettings.lua
@@ -48,47 +48,49 @@ function OpenChiefAddVehicleMenu()
 
             for i = 1, #vehicles, 1 do
                 local isSpawned, mods = IsVehicleSpawned(vehicles[i].plate)
-                while not isSpawned do
-                    Wait(100)
-                end
-                print("Chiefsettings: "..mods)
+                
+                if isSpawned then
+                    print("Chiefsettings: "..mods)
 
-                table.insert(opt, {
-                    title = "Kennzeichen: "..mods.plate,
-                    description = "Deine Ersatzschlüssel: "..vehicles[i].keys,
-                    icon = 'car',
-                    onSelect = function()
-                        local value = lib.inputDialog("Schlüsselkasten", {
-                            {type = "input", label = "Anzeigename", description = "Anzeigename wie die anderen den sehen!"},
-                            {type = "number", label = "Schlüsselanzahl", description = "Anzahl der Ersatzschlüssel.", min = 1, max = vehicles[i].keys},
-                            {type = "number", label = "Rang", description = "Ab welchen Rang darf man das Fahrzeug Fahren?"}
-                        })
+                    table.insert(opt, {
+                        title = "Kennzeichen: "..mods.plate,
+                        description = "Deine Ersatzschlüssel: "..vehicles[i].keys,
+                        icon = 'car',
+                        onSelect = function()
+                            local value = lib.inputDialog("Schlüsselkasten", {
+                                {type = "input", label = "Anzeigename", description = "Anzeigename wie die anderen den sehen!"},
+                                {type = "number", label = "Schlüsselanzahl", description = "Anzahl der Ersatzschlüssel.", min = 1, max = vehicles[i].keys},
+                                {type = "number", label = "Rang", description = "Ab welchen Rang darf man das Fahrzeug Fahren?"}
+                            })
 
-                        QBCore.Functions.TriggerCallback('mh_jobgarage:AddVehicleToJob', function(cb)
-                            if cb.status then
-                                Notification("Schlüsselkasten", cb.text, cb.type)
-                                lib.hideContext('ChiefAddVehicleMenu')
-                                QBCore.Functions.TriggerCallback('mh_jobgarage:CallVehiclesInfo', function(cb)
-                                    OpenMenu(cb)
-                                end, Player.job.name)
-                            else
-                                Notification("Schlüsselkasten", cb.text, cb.type)
-                                if cb.key then
-                                    SetNewWaypoint(Config.KeyMaker.x, Config.KeyMaker.y)
+                            QBCore.Functions.TriggerCallback('mh_jobgarage:AddVehicleToJob', function(cb)
+                                if cb.status then
+                                    Notification("Schlüsselkasten", cb.text, cb.type)
+                                    lib.hideContext('ChiefAddVehicleMenu')
+                                    QBCore.Functions.TriggerCallback('mh_jobgarage:CallVehiclesInfo', function(cb)
+                                        OpenMenu(cb)
+                                    end, Player.job.name)
+                                else
+                                    Notification("Schlüsselkasten", cb.text, cb.type)
+                                    if cb.key then
+                                        SetNewWaypoint(Config.KeyMaker.x, Config.KeyMaker.y)
+                                    end
                                 end
-                            end
-                        end, mods.plate, value)
-                    end
-                })
+                            end, mods.plate, value)
+                        end
+                    })
 
-                lib.registerContext({
-                    id = "ChiefAddVehicleMenu",
-                    title = "Schlüsselkasten",
-                    description = "Füge ein Fahrzeug hinzu.",
-                    options = opt
-                })
+                    lib.registerContext({
+                        id = "ChiefAddVehicleMenu",
+                        title = "Schlüsselkasten",
+                        description = "Füge ein Fahrzeug hinzu.",
+                        options = opt
+                    })
 
-                lib.showContext("ChiefAddVehicleMenu")
+                    lib.showContext("ChiefAddVehicleMenu")
+                else
+                    Notification("Schlüsselkasten", "Kein Fahrzeug gefunden!", "warning")
+                end
             end
         else
             Notification("Schlüsselkasten", "Keine Fahrzeuge von dir Gefunden!", "error")