diff --git a/server/events.lua b/server/events.lua
index 85edaee..e8f6251 100644
--- a/server/events.lua
+++ b/server/events.lua
@@ -83,7 +83,9 @@ AddEventHandler("playerDropped", function()
     local player = source
     local character = NDCore.Players[player]
     if character then
-        NDCore.Functions.UpdateLastLocation(character.id, character.lastLocation)
+        local ped = GetPlayerPed(player)
+        local lastLocation = GetEntityCoords(ped)
+        NDCore.Functions.UpdateLastLocation(character.id, {x = lastLocation.x, y = lastLocation.y, z = lastLocation.z})
     end
     TriggerEvent("ND:characterUnloaded", player, character)
     character = nil
diff --git a/server/main.lua b/server/main.lua
index 2f18d62..f84ab27 100644
--- a/server/main.lua
+++ b/server/main.lua
@@ -11,20 +11,6 @@ function GetCoreObject()
     return NDCore
 end
 
-CreateThread(function()
-    while true do
-        Wait(30000)
-        for player, playerInfo in pairs(NDCore.Players) do
-            local ped = GetPlayerPed(player)
-            if DoesEntityExist(ped) then
-                local lastLocation = GetEntityCoords(ped)
-                playerInfo.lastLocation = {x = lastLocation.x, y = lastLocation.y, z = lastLocation.z}
-                TriggerClientEvent("ND:updateLastLocation", player, playerInfo.lastLocation)
-            end
-        end
-    end
-end)
-
 isResourceStarted("ox_inventory", function(started)
     if not started then return end
     SetConvarReplicated("inventory:framework", "nd")