diff --git a/[core]/es_extended/client/main.lua b/[core]/es_extended/client/main.lua
index 6516355e..9912bbff 100644
--- a/[core]/es_extended/client/main.lua
+++ b/[core]/es_extended/client/main.lua
@@ -59,16 +59,21 @@ local function onPlayerSpawn()
     ESX.SetPlayerData("dead", false)
 end
 
+local isFirstSpawn = true
 AddEventHandler("playerSpawned", onPlayerSpawn)
 AddEventHandler("esx:onPlayerSpawn", function()
     onPlayerSpawn()
 
-    if ESX.PlayerData.metadata.health then
-        SetEntityHealth(ESX.PlayerData.ped, ESX.PlayerData.metadata.health)
-    end
+    if isFirstSpawn then
+        isFirstSpawn = false
 
-    if ESX.PlayerData.metadata.armor and ESX.PlayerData.metadata.armor > 0 then
-        SetPedArmour(ESX.PlayerData.ped, ESX.PlayerData.metadata.armor)
+        if ESX.PlayerData.metadata.health then
+            SetEntityHealth(ESX.PlayerData.ped, ESX.PlayerData.metadata.health)
+        end
+
+        if ESX.PlayerData.metadata.armor and ESX.PlayerData.metadata.armor > 0 then
+            SetPedArmour(ESX.PlayerData.ped, ESX.PlayerData.metadata.armor)
+        end
     end
 end)