diff --git a/[esx]/es_extended/client/main.lua b/[esx]/es_extended/client/main.lua
index 316d3960..2a941f23 100644
--- a/[esx]/es_extended/client/main.lua
+++ b/[esx]/es_extended/client/main.lua
@@ -45,10 +45,10 @@ AddEventHandler('esx:playerLoaded', function(xPlayer, isNew, skin)
 	end
 
 	ESX.PlayerLoaded = true
-	
+
 	while ESX.PlayerData.ped == nil do Wait(20) end
 
-	-- enable PVP
+		-- enable PVP
 	if Config.EnablePVP then
 		SetCanAttackFriendly(ESX.PlayerData.ped, true, false)
 		NetworkSetFriendlyFireOption(true)
@@ -145,10 +145,8 @@ RegisterNetEvent('esx:setMaxWeight')
 AddEventHandler('esx:setMaxWeight', function(newMaxWeight) ESX.SetPlayerData("maxWeight", newMaxWeight) end)
 
 local function onPlayerSpawn()
-	if ESX.PlayerLoaded then
 		ESX.SetPlayerData('ped', PlayerPedId())
 		ESX.SetPlayerData('dead', false)
-	end
 end
 
 AddEventHandler('playerSpawned', onPlayerSpawn)