diff --git a/build-number.txt b/build-number.txt
index 1ba68305..af9719be 100644
--- a/build-number.txt
+++ b/build-number.txt
@@ -1 +1 @@
-3507
\ No newline at end of file
+3517
\ No newline at end of file
diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/RestartCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/RestartCommand.java
index 6cbb500f..8c6d5280 100644
--- a/src/main/java/me/chayapak1/chomens_bot/commands/RestartCommand.java
+++ b/src/main/java/me/chayapak1/chomens_bot/commands/RestartCommand.java
@@ -25,7 +25,10 @@ public class RestartCommand extends Command {
 
         final String reason = context.getString(true, false);
 
-        Main.stop(12, reason.isEmpty() ? null : reason, I18nUtilities.get("info.restarting"));
+        new Thread(
+                () -> Main.stop(12, reason.isEmpty() ? null : reason, I18nUtilities.get("info.restarting")),
+                "ChomeNS Bot Shutdown Thread"
+        ).start();
 
         return Component.translatable("commands.restart.output", bot.colorPalette.defaultColor);
     }
diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/StopCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/StopCommand.java
index 979547a4..43695496 100644
--- a/src/main/java/me/chayapak1/chomens_bot/commands/StopCommand.java
+++ b/src/main/java/me/chayapak1/chomens_bot/commands/StopCommand.java
@@ -24,7 +24,10 @@ public class StopCommand extends Command {
 
         final String reason = context.getString(true, false);
 
-        Main.stop(0, reason.isEmpty() ? null : reason);
+        new Thread(
+                () -> Main.stop(0, reason.isEmpty() ? null : reason),
+                "ChomeNS Bot Shutdown Thread"
+        ).start();
 
         return Component.translatable("commands.stop.output", bot.colorPalette.defaultColor);
     }