diff --git a/core/src/main/java/net/momirealms/customfishing/bukkit/bag/BukkitBagManager.java b/core/src/main/java/net/momirealms/customfishing/bukkit/bag/BukkitBagManager.java
index 71cef28d..8225c9e4 100644
--- a/core/src/main/java/net/momirealms/customfishing/bukkit/bag/BukkitBagManager.java
+++ b/core/src/main/java/net/momirealms/customfishing/bukkit/bag/BukkitBagManager.java
@@ -29,6 +29,7 @@ import net.momirealms.customfishing.api.mechanic.bag.FishingBagHolder;
 import net.momirealms.customfishing.api.mechanic.context.Context;
 import net.momirealms.customfishing.api.mechanic.requirement.Requirement;
 import net.momirealms.customfishing.api.mechanic.requirement.RequirementManager;
+import net.momirealms.customfishing.api.storage.DataStorageProvider;
 import net.momirealms.customfishing.api.storage.user.UserData;
 import net.momirealms.customfishing.api.util.EventUtils;
 import net.momirealms.customfishing.bukkit.config.BukkitConfigManager;
@@ -90,7 +91,9 @@ public class BukkitBagManager implements BagManager, Listener {
     @Override
     public void disable() {
         unload();
-        this.plugin.getStorageManager().getDataSource().updateManyPlayersData(tempEditMap.values(), true);
+        if (!tempEditMap.isEmpty()) {
+            this.plugin.getStorageManager().getDataSource().updateManyPlayersData(tempEditMap.values(), true);
+        }
     }
 
     @EventHandler
diff --git a/core/src/main/java/net/momirealms/customfishing/bukkit/storage/BukkitStorageManager.java b/core/src/main/java/net/momirealms/customfishing/bukkit/storage/BukkitStorageManager.java
index 07ae356e..9defc24f 100644
--- a/core/src/main/java/net/momirealms/customfishing/bukkit/storage/BukkitStorageManager.java
+++ b/core/src/main/java/net/momirealms/customfishing/bukkit/storage/BukkitStorageManager.java
@@ -143,12 +143,13 @@ public class BukkitStorageManager implements StorageManager, Listener {
     @Override
     public void disable() {
         HandlerList.unregisterAll(this);
-        this.dataSource.updateManyPlayersData(onlineUserMap.values(), true);
-        this.onlineUserMap.clear();
+        if (this.dataSource != null && !onlineUserMap.isEmpty())
+            this.dataSource.updateManyPlayersData(onlineUserMap.values(), true);
         if (this.dataSource != null)
             this.dataSource.disable();
         if (this.redisManager != null)
             this.redisManager.disable();
+        this.onlineUserMap.clear();
     }
 
     @NotNull