diff --git a/build-number.txt b/build-number.txt
index 3189a303..619686ab 100644
--- a/build-number.txt
+++ b/build-number.txt
@@ -1 +1 @@
-1655
\ No newline at end of file
+1657
\ No newline at end of file
diff --git a/src/main/java/me/chayapak1/chomens_bot/Main.java b/src/main/java/me/chayapak1/chomens_bot/Main.java
index abee9570..13dd45f9 100644
--- a/src/main/java/me/chayapak1/chomens_bot/Main.java
+++ b/src/main/java/me/chayapak1/chomens_bot/Main.java
@@ -217,14 +217,14 @@ public class Main {
         }
 
         if (discordEnabled) {
-            discord.jda.shutdown();
-
             for (int i = 0; i < 150; i++) {
                 try {
                     if (!ArrayUtilities.isAllTrue(stoppedDiscord)) Thread.sleep(50);
                     else break;
                 } catch (InterruptedException ignored) {}
             }
+
+            discord.jda.shutdown();
         }
 
         if (callSystemExit) System.exit(exitCode);
diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/DiscordPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/DiscordPlugin.java
index 0ff9c8ee..a414f493 100644
--- a/src/main/java/me/chayapak1/chomens_bot/plugins/DiscordPlugin.java
+++ b/src/main/java/me/chayapak1/chomens_bot/plugins/DiscordPlugin.java
@@ -68,6 +68,7 @@ public class DiscordPlugin {
 
         final JDABuilder builder = JDABuilder.createDefault(config.discord.token);
         builder.enableIntents(GatewayIntent.MESSAGE_CONTENT);
+        builder.setEnableShutdownHook(false);
         try {
             jda = builder.build();
             jda.awaitReady();