diff --git a/common/src/main/java/net/momirealms/customnameplates/common/plugin/scheduler/AbstractJavaScheduler.java b/common/src/main/java/net/momirealms/customnameplates/common/plugin/scheduler/AbstractJavaScheduler.java
index 3682cd2..b94cd82 100644
--- a/common/src/main/java/net/momirealms/customnameplates/common/plugin/scheduler/AbstractJavaScheduler.java
+++ b/common/src/main/java/net/momirealms/customnameplates/common/plugin/scheduler/AbstractJavaScheduler.java
@@ -81,28 +81,12 @@ public abstract class AbstractJavaScheduler<T> implements SchedulerAdapter<T> {
 
     @Override
     public void shutdownScheduler() {
-        this.scheduler.shutdown();
-        try {
-            if (!this.scheduler.awaitTermination(1, TimeUnit.MINUTES)) {
-                this.plugin.getPluginLogger().severe("Timed out waiting for the CustomNameplates scheduler to terminate");
-                reportRunningTasks(thread -> thread.getName().equals("nameplates-scheduler"));
-            }
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
+        this.scheduler.shutdownNow();
     }
 
     @Override
     public void shutdownExecutor() {
-        this.worker.shutdown();
-        try {
-            if (!this.worker.awaitTermination(1, TimeUnit.MINUTES)) {
-                this.plugin.getPluginLogger().severe("Timed out waiting for the CustomNameplates worker thread pool to terminate");
-                reportRunningTasks(thread -> thread.getName().startsWith("nameplates-worker-"));
-            }
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
+        this.worker.shutdownNow();
     }
 
     private void reportRunningTasks(Predicate<Thread> predicate) {
diff --git a/platforms/bukkit/src/main/java/net/momirealms/customnameplates/bukkit/BukkitCustomNameplates.java b/platforms/bukkit/src/main/java/net/momirealms/customnameplates/bukkit/BukkitCustomNameplates.java
index 91f7dae..a72c842 100644
--- a/platforms/bukkit/src/main/java/net/momirealms/customnameplates/bukkit/BukkitCustomNameplates.java
+++ b/platforms/bukkit/src/main/java/net/momirealms/customnameplates/bukkit/BukkitCustomNameplates.java
@@ -310,7 +310,6 @@ public class BukkitCustomNameplates extends CustomNameplates implements Listener
         this.scheduledMainTask = getScheduler().asyncRepeating(mainTask, 50, 50, TimeUnit.MILLISECONDS);
     }
 
-
     @Override
     public InputStream getResourceStream(String filePath) {
         return getBootstrap().getResource(filePath.replace("\\", "/"));