diff --git a/[esx]/es_extended/client/main.lua b/[esx]/es_extended/client/main.lua
index ca5e456f..316d3960 100644
--- a/[esx]/es_extended/client/main.lua
+++ b/[esx]/es_extended/client/main.lua
@@ -44,8 +44,10 @@ AddEventHandler('esx:playerLoaded', function(xPlayer, isNew, skin)
 		end)
 	end
 
-	while ESX.PlayerData.ped == nil do Wait(20) end
 	ESX.PlayerLoaded = true
+	
+	while ESX.PlayerData.ped == nil do Wait(20) end
+
 	-- enable PVP
 	if Config.EnablePVP then
 		SetCanAttackFriendly(ESX.PlayerData.ped, true, false)