diff --git a/[esx]/es_extended/client/main.lua b/[esx]/es_extended/client/main.lua
index 340ffde6..c464139f 100644
--- a/[esx]/es_extended/client/main.lua
+++ b/[esx]/es_extended/client/main.lua
@@ -84,15 +84,13 @@ RegisterNetEvent('esx:setMaxWeight')
 AddEventHandler('esx:setMaxWeight', function(newMaxWeight) ESX.PlayerData.maxWeight = newMaxWeight end)
 
 AddEventHandler('esx:onPlayerSpawn', function()
-	local playerPed = PlayerPedId()
-	if ESX.PlayerData.ped ~= playerPed then ESX.SetPlayerData('ped', playerPed) end
-	if ESX.PlayerData.dead ~= false then ESX.SetPlayerData('dead', false) end
+	ESX.SetPlayerData('ped', PlayerPedId())
+	ESX.SetPlayerData('dead', false)
 end)
 
 AddEventHandler('esx:onPlayerDeath', function()
-	local playerPed = PlayerPedId()
-	if ESX.PlayerData.ped ~= playerPed then ESX.SetPlayerData('ped', playerPed) end
-	if ESX.PlayerData.dead ~= false then ESX.SetPlayerData('dead', true) end
+	ESX.SetPlayerData('ped', PlayerPedId())
+	ESX.SetPlayerData('dead', true)
 end)
 
 AddEventHandler('skinchanger:modelLoaded', function()
@@ -103,8 +101,7 @@ AddEventHandler('skinchanger:modelLoaded', function()
 end)
 
 AddEventHandler('esx:restoreLoadout', function()
-	local playerPed = PlayerPedId()
-	if ESX.PlayerData.ped ~= playerPed then ESX.SetPlayerData('ped', playerPed) end
+	ESX.SetPlayerData('ped', PlayerPedId())
 	local ammoTypes = {}
 	RemoveAllPedWeapons(ESX.PlayerData.ped, true)