diff --git a/src/main/java/de/bixilon/minosoft/util/task/pool/ThreadPool.kt b/src/main/java/de/bixilon/minosoft/util/task/pool/ThreadPool.kt
index a0ab7eb72..07ea13d2b 100644
--- a/src/main/java/de/bixilon/minosoft/util/task/pool/ThreadPool.kt
+++ b/src/main/java/de/bixilon/minosoft/util/task/pool/ThreadPool.kt
@@ -136,6 +136,13 @@ open class ThreadPool(
 
     override fun shutdown() {
         state = ThreadPoolStates.STOPPING
+        synchronized(threads) {
+            for (thread in threads.toSynchronizedList()) {
+                if (thread.state == Thread.State.TIMED_WAITING) {
+                    thread.interrupt()
+                }
+            }
+        }
         while (threads.isNotEmpty()) {
             Thread.sleep(1L)
         }