diff --git a/[esx_addons]/esx_property/server/main.lua b/[esx_addons]/esx_property/server/main.lua
index fe52993b..d18c52a4 100644
--- a/[esx_addons]/esx_property/server/main.lua
+++ b/[esx_addons]/esx_property/server/main.lua
@@ -1109,6 +1109,12 @@ AddEventHandler('onResourceStop', function(ResourceName)
   end
 end)
 
+AddEventHandler('onServerResourceStop', function(ResourceName)
+  if ResourceName == GetCurrentResourceName() then
+    PropertySave(_U("resource_stop"))
+  end
+end)
+
 -- Save Properties every x Minutes 
 
 CreateThread(function()