diff --git a/src/main/java/net/momirealms/customcrops/api/object/pot/Pot.java b/src/main/java/net/momirealms/customcrops/api/object/pot/Pot.java
index edd5443..7b8c18d 100644
--- a/src/main/java/net/momirealms/customcrops/api/object/pot/Pot.java
+++ b/src/main/java/net/momirealms/customcrops/api/object/pot/Pot.java
@@ -73,6 +73,7 @@ public class Pot implements Serializable {
     whether to change block model
      */
     public boolean reduceWater() {
+        if (water == 0) return false;
         water--;
         water = Math.max(0, water);
         return water == 0;
diff --git a/src/main/java/net/momirealms/customcrops/api/object/world/CCWorld.java b/src/main/java/net/momirealms/customcrops/api/object/world/CCWorld.java
index 4d0d7b9..e863de0 100644
--- a/src/main/java/net/momirealms/customcrops/api/object/world/CCWorld.java
+++ b/src/main/java/net/momirealms/customcrops/api/object/world/CCWorld.java
@@ -429,7 +429,7 @@ public class CCWorld extends Function {
 
                 Fertilizer fertilizer = pot.getFertilizer();
                 boolean wet = pot.isWet();
-                if (!wet && fertilizer == null) {
+                if (!wet && fertilizer == null && !ConfigManager.onlyInLoadedChunks) {
                     removePotData(simpleLocation);
                 }
 
@@ -454,7 +454,9 @@ public class CCWorld extends Function {
                         String replacer = wet ? potConfig.getWetPot(fertilizer) : potConfig.getDryPot(fertilizer);
                         String id = plugin.getPlatformInterface().getBlockID(block);
                         if (ConfigManager.enableCorruptionFixer && id.equals("NOTE_BLOCK")) {
-                            plugin.getPlatformInterface().placeNoteBlock(location, replacer);
+                            corruptedPot.put(simpleLocation, pot.getPotKey());
+                            if (ConfigManager.debugCorruption) AdventureUtils.consoleMessage("[CustomCrops] Corrupted pot found at: " + simpleLocation);
+                            //plugin.getPlatformInterface().placeNoteBlock(location, replacer);
                             return;
                         }
                         String potKey = plugin.getPotManager().getPotKeyByBlockID(id);