diff --git a/[core]/es_extended/server/common.lua b/[core]/es_extended/server/common.lua
index 9d60a35c..4a41cd92 100644
--- a/[core]/es_extended/server/common.lua
+++ b/[core]/es_extended/server/common.lua
@@ -14,6 +14,11 @@ Core.playersByIdentifier = {}
 
 Core.vehicleTypesByModel = {}
 
+
+RegisterNetEvent('esx:onPlayerSpawn', function() 
+    ESX.Players[source].spawned = true 
+end)
+
 AddEventHandler("esx:getSharedObject", function()
 	local Invoke = GetInvokingResource()
 	print(("[^1ERROR^7] Resource ^5%s^7 Used the ^5getSharedObject^7 Event, this event ^1no longer exists!^7 Visit https://documentation.esx-framework.org/tutorials/tutorials-esx/sharedevent for how to fix!"):format(Invoke))
diff --git a/[core]/es_extended/server/functions.lua b/[core]/es_extended/server/functions.lua
index 87751761..510be1ed 100644
--- a/[core]/es_extended/server/functions.lua
+++ b/[core]/es_extended/server/functions.lua
@@ -171,6 +171,10 @@ local function updateHealthAndArmorInMetadata(xPlayer)
 end
 
 function Core.SavePlayer(xPlayer, cb)
+	if not xPlayer.spawned then 
+        return cb and cb() 
+    end 
+	
     updateHealthAndArmorInMetadata(xPlayer)
 	local parameters <const> = {
 		json.encode(xPlayer.getAccounts(true)),