diff --git a/[core]/es_extended/client/main.lua b/[core]/es_extended/client/main.lua
index 3cfdc449..a4d1daa9 100644
--- a/[core]/es_extended/client/main.lua
+++ b/[core]/es_extended/client/main.lua
@@ -68,7 +68,7 @@ AddEventHandler("esx:onPlayerSpawn", function()
     if isFirstSpawn then
         isFirstSpawn = false
 
-        if ESX.PlayerData.metadata.health then
+        if ESX.PlayerData.metadata.health and (ESX.PlayerData.metadata.health > 0 or Config.SaveDeathStatus) then
             SetEntityHealth(ESX.PlayerData.ped, ESX.PlayerData.metadata.health)
         end
 
diff --git a/[core]/es_extended/shared/config/main.lua b/[core]/es_extended/shared/config/main.lua
index 2c375605..7db1e472 100644
--- a/[core]/es_extended/shared/config/main.lua
+++ b/[core]/es_extended/shared/config/main.lua
@@ -40,6 +40,7 @@ Config.LogPaycheck = false -- Logs paychecks to a nominated Discord channel via
 Config.EnableSocietyPayouts = false -- pay from the society account that the player is employed at? Requirement: esx_society
 Config.MaxWeight = 24 -- the max inventory weight without a backpack
 Config.PaycheckInterval = 7 * 60000 -- how often to receive paychecks in milliseconds
+Config.SaveDeathStatus = true -- Save the death status of a player
 Config.EnableDebug = false -- Use Debug options?
 
 Config.DefaultJobDuty = true -- A players default duty status when changing jobs