diff --git a/resources/[carscripts]/mh_garage/client/main.lua b/resources/[carscripts]/mh_garage/client/main.lua
index 19e505dae..22d54ec79 100644
--- a/resources/[carscripts]/mh_garage/client/main.lua
+++ b/resources/[carscripts]/mh_garage/client/main.lua
@@ -80,12 +80,13 @@ CreateThread(function()
             local spawnDistance = v.NPC.distance
         
             if dist < spawnDistance and not isNPCSpawned then
+                isNPCSpawned = true
                 print(isNPCSpawned)
                 CurrentZone = v
                 SpawnGuardNPC(v.NPC)
-                Wait(300)
                 AddTargetOptions()
             elseif dist > spawnDistance and isNPCSpawned then
+                isNPCSpawned = false
                 CurrentZone = nil
                 exports['qb-target']:RemoveTargetEntity(npcHandle)
                 RemoveGuardNPC()