diff --git a/[core]/es_extended/client/main.lua b/[core]/es_extended/client/main.lua
index 82d2e745..2e4e1a66 100644
--- a/[core]/es_extended/client/main.lua
+++ b/[core]/es_extended/client/main.lua
@@ -52,7 +52,9 @@ AddEventHandler('esx:playerLoaded', function(xPlayer, isNew, skin)
 	ESX.PlayerLoaded = true
 
 	while ESX.PlayerData.ped == nil do Wait(20) end
-
+        
+    while not HasCollisionLoadedAroundEntity(ESX.PlayerData.ped) do Wait(0) end
+        
 	if Config.EnablePVP then
 		SetCanAttackFriendly(ESX.PlayerData.ped, true, false)
 		NetworkSetFriendlyFireOption(true)