diff --git a/src/main/java/world/bentobox/bentobox/managers/AddonsManager.java b/src/main/java/world/bentobox/bentobox/managers/AddonsManager.java
index 0b78c10fb..8ccc1bc88 100644
--- a/src/main/java/world/bentobox/bentobox/managers/AddonsManager.java
+++ b/src/main/java/world/bentobox/bentobox/managers/AddonsManager.java
@@ -450,8 +450,8 @@ public class AddonsManager {
     public void disableAddons() {
         if (!getEnabledAddons().isEmpty()) {
             plugin.log("Disabling addons...");
-            // Disable addons
-            getEnabledAddons().forEach(this::disable);
+            // Disable addons - pladdons are disabled by the server
+            getEnabledAddons().stream().filter(addon -> !pladdons.keySet().contains(addon)).forEach(this::disable);
             plugin.log("Addons successfully disabled.");
         }
         // Unregister all commands