diff --git a/src/main/java/net/coreprotect/CoreProtect.java b/src/main/java/net/coreprotect/CoreProtect.java
index b9c1414..ba1c32c 100755
--- a/src/main/java/net/coreprotect/CoreProtect.java
+++ b/src/main/java/net/coreprotect/CoreProtect.java
@@ -13,6 +13,7 @@ import net.coreprotect.config.Config;
 import net.coreprotect.config.ConfigHandler;
 import net.coreprotect.consumer.Consumer;
 import net.coreprotect.consumer.process.Process;
+import net.coreprotect.database.Database;
 import net.coreprotect.language.Language;
 import net.coreprotect.language.Phrase;
 import net.coreprotect.listener.ListenerHandler;
@@ -189,6 +190,7 @@ public final class CoreProtect extends JavaPlugin {
                 Thread.sleep(100);
             }
 
+            Database.closeConnection();
             Chat.console(Phrase.build(Phrase.DISABLE_SUCCESS, "CoreProtect v" + plugin.getDescription().getVersion()));
         }
         catch (Exception e) {
diff --git a/src/main/java/net/coreprotect/config/ConfigHandler.java b/src/main/java/net/coreprotect/config/ConfigHandler.java
index abaed07..dc5d44e 100644
--- a/src/main/java/net/coreprotect/config/ConfigHandler.java
+++ b/src/main/java/net/coreprotect/config/ConfigHandler.java
@@ -175,10 +175,7 @@ public class ConfigHandler extends Queue {
 
     public static void loadDatabase() {
         // close old pool when we reload the database, e.g. in purge command
-        if (ConfigHandler.hikariDataSource != null) {
-            ConfigHandler.hikariDataSource.close();
-            ConfigHandler.hikariDataSource = null;
-        }
+        Database.closeConnection();
 
         if (!Config.getGlobal().MYSQL) {
             try {
diff --git a/src/main/java/net/coreprotect/database/Database.java b/src/main/java/net/coreprotect/database/Database.java
index 36b354e..2e5c2b5 100755
--- a/src/main/java/net/coreprotect/database/Database.java
+++ b/src/main/java/net/coreprotect/database/Database.java
@@ -175,6 +175,18 @@ public class Database extends Queue {
         return connection;
     }
 
+    public static void closeConnection() {
+        try {
+            if (ConfigHandler.hikariDataSource != null) {
+                ConfigHandler.hikariDataSource.close();
+                ConfigHandler.hikariDataSource = null;
+            }
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
     public static void performUpdate(Statement statement, long id, int action, int table) {
         try {
             int rolledBack = 1;