diff --git a/[esx]/es_extended/imports.lua b/[esx]/es_extended/imports.lua
index 71dd9f47..7a793301 100644
--- a/[esx]/es_extended/imports.lua
+++ b/[esx]/es_extended/imports.lua
@@ -1,10 +1,22 @@
 ESX = exports['es_extended']:getSharedObject()
 
 if not IsDuplicityVersion() then -- Only register this event for the client
-	AddEventHandler('esx:setPlayerData', function(key, val, last)
-		if GetInvokingResource() == 'es_extended' then
-			ESX.PlayerData[key] = val
-			if OnPlayerData ~= nil then OnPlayerData(key, val, last) end
-		end
-	end)
-end
\ No newline at end of file
+    AddEventHandler('esx:setPlayerData', function(key, val, last)
+        if GetInvokingResource() == 'es_extended' then
+            ESX.PlayerData[key] = val
+            if OnPlayerData then
+                OnPlayerData(key, val, last)
+            end
+        end
+    end)
+
+    RegisterNetEvent('esx:playerLoaded', function(xPlayer)
+        ESX.PlayerData = xPlayer
+        ESX.PlayerLoaded = true
+    end)
+
+    RegisterNetEvent('esx:onPlayerLogout', function()
+        ESX.PlayerLoaded = false
+        ESX.PlayerData = {}
+    end)
+end