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 04083e0..1220234 100644
--- a/plugin/src/main/java/lol/pyr/znpcsplus/npc/NpcRegistryImpl.java
+++ b/plugin/src/main/java/lol/pyr/znpcsplus/npc/NpcRegistryImpl.java
@@ -63,7 +63,9 @@ public class NpcRegistryImpl implements NpcRegistry {
     }
 
     private void unregisterAll() {
-        for (NpcEntryImpl entry : getAllModifiable()) entry.getNpc().delete();
+        for (NpcEntryImpl entry : getAll()) {
+            if (entry.isSave()) entry.getNpc().delete();
+        }
         npcList.clear();
         npcIdLookupMap.clear();
         npcUuidLookupMap.clear();