diff --git a/api/src/main/java/net/momirealms/customcrops/api/core/world/WorldScheduler.java b/api/src/main/java/net/momirealms/customcrops/api/core/world/WorldScheduler.java
index 5439645..c69829d 100644
--- a/api/src/main/java/net/momirealms/customcrops/api/core/world/WorldScheduler.java
+++ b/api/src/main/java/net/momirealms/customcrops/api/core/world/WorldScheduler.java
@@ -72,27 +72,11 @@ public class WorldScheduler {
     }
 
     public void shutdownScheduler() {
-        this.scheduler.shutdown();
-        try {
-            if (!this.scheduler.awaitTermination(1, TimeUnit.MINUTES)) {
-                this.plugin.getPluginLogger().severe("Timed out waiting for the CustomCrops scheduler to terminate");
-                reportRunningTasks(thread -> thread.getName().equals("customcrops-world-scheduler"));
-            }
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
+        this.scheduler.shutdownNow();
     }
 
     public void shutdownExecutor() {
-        this.worker.shutdown();
-        try {
-            if (!this.worker.awaitTermination(1, TimeUnit.MINUTES)) {
-                this.plugin.getPluginLogger().severe("Timed out waiting for the CustomCrops worker thread pool to terminate");
-                reportRunningTasks(thread -> thread.getName().startsWith("customcrops-world-worker-"));
-            }
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
+        this.worker.shutdownNow();
     }
 
     private void reportRunningTasks(Predicate<Thread> predicate) {
diff --git a/gradle.properties b/gradle.properties
index 02b41e9..1140cd8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
 # Project settings
 # Rule: [major update].[feature update].[bug fix]
-project_version=3.6.15
+project_version=3.6.16
 config_version=41
 project_group=net.momirealms