diff --git a/leaf-server/src/main/java/gg/pufferfish/pufferfish/util/AsyncExecutor.java b/leaf-server/src/main/java/gg/pufferfish/pufferfish/util/AsyncExecutor.java
index 2b57a863..85d37d3d 100644
--- a/leaf-server/src/main/java/gg/pufferfish/pufferfish/util/AsyncExecutor.java
+++ b/leaf-server/src/main/java/gg/pufferfish/pufferfish/util/AsyncExecutor.java
@@ -13,7 +13,7 @@ public class AsyncExecutor implements Runnable {
 
     private final Logger LOGGER = LogManager.getLogger("Leaf");
     private final PriorityQueue<Runnable> jobs = PriorityQueues.synchronize(new ObjectArrayFIFOQueue<>());
-    private final Thread thread;
+    public final Thread thread;
     private volatile boolean killswitch = false;
 
     public AsyncExecutor(String threadName) {
diff --git a/leaf-server/src/main/java/org/dreeam/leaf/async/ShutdownExecutors.java b/leaf-server/src/main/java/org/dreeam/leaf/async/ShutdownExecutors.java
index be79ba70..3103e125 100644
--- a/leaf-server/src/main/java/org/dreeam/leaf/async/ShutdownExecutors.java
+++ b/leaf-server/src/main/java/org/dreeam/leaf/async/ShutdownExecutors.java
@@ -14,7 +14,7 @@ public class ShutdownExecutors {
     public static final Logger LOGGER = LogManager.getLogger("Leaf");
 
     public static void shutdown(MinecraftServer server) {
-        if (server.mobSpawnExecutor != null) {
+        if (server.mobSpawnExecutor != null && server.mobSpawnExecutor.thread.isAlive()) {
             LOGGER.info("Waiting for mob spawning thread to shutdown...");
             try {
                 server.mobSpawnExecutor.join(3000L);