diff --git a/shared/make/makePed.lua b/shared/make/makePed.lua
index eb25bbc..9ab670c 100644
--- a/shared/make/makePed.lua
+++ b/shared/make/makePed.lua
@@ -247,7 +247,7 @@ function GenerateRandomPedData(data)
     return newTable
 end
 
-onPlayerUnloaded(function()
+onPlayerUnload(function()
     for k in pairs(Peds) do
         DeletePed(Peds[k])
     end
diff --git a/shared/make/makeProp.lua b/shared/make/makeProp.lua
index 1ccd051..28ac20d 100644
--- a/shared/make/makeProp.lua
+++ b/shared/make/makeProp.lua
@@ -97,7 +97,7 @@ function destroyProp(entity)
     end
 end
 
-onPlayerUnloaded(function()
+onPlayerUnload(function()
     for k in pairs(Props) do
         DeleteObject(Props[k])
     end
diff --git a/shared/targets.lua b/shared/targets.lua
index 2995e35..178a72b 100644
--- a/shared/targets.lua
+++ b/shared/targets.lua
@@ -503,8 +503,7 @@ end
 -- Cleanup on Resource Stop
 -------------------------------------------------------------
 
--- When the current resource stops, remove all targets.
-onResourceStop(function()
+local function CleanupTargets()
     -- Remove entity targets.
     for i = 1, #targetEntities do
         if isStarted(OXTargetExport) then
@@ -529,4 +528,13 @@ onResourceStop(function()
             exports[QBTargetExport]:RemoveZone(circleTargets[i].name)
         end
     end
+end
+
+onPlayerUnload(function()
+    CleanupTargets()
+end)
+
+-- When the current resource stops, remove all targets.
+onResourceStop(function()
+    CleanupTargets()
 end, true)
\ No newline at end of file