diff --git a/[esx]/es_extended/client/main.lua b/[esx]/es_extended/client/main.lua
index e5d6aec7..340ffde6 100644
--- a/[esx]/es_extended/client/main.lua
+++ b/[esx]/es_extended/client/main.lua
@@ -1,11 +1,14 @@
 local pickups = {}
 
 Citizen.CreateThread(function()
-	while NetworkIsPlayerActive(PlayerId()) and not Config.Multichar do
-		Citizen.Wait(5)
-		DoScreenFadeOut(0)
-		TriggerServerEvent('esx:onPlayerJoined')
-		break
+	while not Config.Multichar do
+		Citizen.Wait(0)
+		if NetworkIsPlayerActive(PlayerId()) then
+			exports.spawnmanager:setAutoSpawn(false)
+			DoScreenFadeOut(0)
+			TriggerServerEvent('esx:onPlayerJoined')
+			break
+		end
 	end
 end)