diff --git a/src/main/java/de/iani/treasurechest/TreasureChest.java b/src/main/java/de/iani/treasurechest/TreasureChest.java
index 1dffc40..b95180a 100644
--- a/src/main/java/de/iani/treasurechest/TreasureChest.java
+++ b/src/main/java/de/iani/treasurechest/TreasureChest.java
@@ -89,6 +89,18 @@
         }, 8456, 140000);
     }
 
+    @Override
+    public void onDisable() {
+        if (workerThread != null) {
+            workerThread.shutdown();
+            workerThread = null;
+        }
+        if (database != null) {
+            database.disconnect();
+            database = null;
+        }
+    }
+
     public PlayerUUIDCache getPlayerUUIDCache() {
         return playerUUIDCache;
     }
diff --git a/src/main/java/de/iani/treasurechest/worker/WorkerThread.java b/src/main/java/de/iani/treasurechest/worker/WorkerThread.java
index 5504eaf..fa8fa41 100644
--- a/src/main/java/de/iani/treasurechest/worker/WorkerThread.java
+++ b/src/main/java/de/iani/treasurechest/worker/WorkerThread.java
@@ -44,10 +44,6 @@
         if (interrupt) {
             Thread.currentThread().interrupt();
         }
-        if (database != null) {
-            database.disconnect();
-            database = null;
-        }
     }
 
     @Override