diff --git a/[core]/es_extended/client/imports/point.lua b/[core]/es_extended/client/imports/point.lua
index 5c505cc82..b4f3da5c8 100644
--- a/[core]/es_extended/client/imports/point.lua
+++ b/[core]/es_extended/client/imports/point.lua
@@ -39,9 +39,23 @@ function Point:constructor(properties)
 end
 
 function Point:delete()
-	ESX.RemovePointInternal(self.handle)
+    if not nearby[self.handle] then
+        return
+    end
+    nearby[self.handle] = nil
+
+    if self.leave then
+        self:leave()
+    end
+
+    if next(nearby) == nil then
+        loop = false
+    end
+
+    ESX.RemovePointInternal(self.handle)
 end
 
+
 function Point:toggle(hidden)
 	if hidden == nil then
 		hidden = not self.hidden