diff --git a/imports/zones/shared.lua b/imports/zones/shared.lua
index 46916417b..e51d602ca 100644
--- a/imports/zones/shared.lua
+++ b/imports/zones/shared.lua
@@ -122,8 +122,15 @@ local function removeZone(zone)
 
     insideZones[zone.id] = nil
 
-    table.remove(exitingZones, exitingZones:indexOf(zone))
-    table.remove(enteringZones, enteringZones:indexOf(zone))
+    local exitingIndex = exitingZones:indexOf(zone)
+    if exitingIndex then
+        table.remove(exitingZones, exitingIndex)
+    end
+
+    local enteringIndex = enteringZones:indexOf(zone)
+    if enteringIndex then
+        table.remove(enteringZones, enteringIndex)
+    end
 end
 
 CreateThread(function()