diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/npc/NpcRegistryImpl.java b/plugin/src/main/java/lol/pyr/znpcsplus/npc/NpcRegistryImpl.java
index 641302b..e0f34ce 100644
--- a/plugin/src/main/java/lol/pyr/znpcsplus/npc/NpcRegistryImpl.java
+++ b/plugin/src/main/java/lol/pyr/znpcsplus/npc/NpcRegistryImpl.java
@@ -57,7 +57,7 @@ public class NpcRegistryImpl implements NpcRegistry {
     }
 
     private void unregisterAll() {
-        for (NpcEntryImpl entry : npcList) entry.getNpc().delete();
+        for (NpcEntryImpl entry : getAllModifiable()) entry.getNpc().delete();
         npcList.clear();
         npcIdLookupMap.clear();
         npcUuidLookupMap.clear();