diff --git a/patches/server/0148-Base-thread-pool.patch b/patches/server/0148-Base-thread-pool.patch
index c8551b1..4542647 100644
--- a/patches/server/0148-Base-thread-pool.patch
+++ b/patches/server/0148-Base-thread-pool.patch
@@ -4427,10 +4427,10 @@ index 0000000000000000000000000000000000000000..eab769d7319f26db1f4db9599a3c263c
 +}
 diff --git a/src/main/java/org/galemc/gale/executor/thread/BaseThread.java b/src/main/java/org/galemc/gale/executor/thread/BaseThread.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..17ae524053949073fcdcbccc53327c42ba1903c6
+index 0000000000000000000000000000000000000000..f0bf8cfc28107d3f2421d033e45f1a88f8d86d5b
 --- /dev/null
 +++ b/src/main/java/org/galemc/gale/executor/thread/BaseThread.java
-@@ -0,0 +1,722 @@
+@@ -0,0 +1,725 @@
 +// Gale - base thread pool
 +
 +package org.galemc.gale.executor.thread;
@@ -4715,6 +4715,9 @@ index 0000000000000000000000000000000000000000..17ae524053949073fcdcbccc53327c42
 +        to be released.
 +         */
 +        while (true) {
++            if (timeoutTime != null && System.nanoTime() - timeoutTime >= 0) {
++                break;
++            }
 +            if (stopCondition != null) {
 +                if (this == MinecraftServer.serverThread) {
 +                    MinecraftServer.currentManagedBlockStopConditionHasBecomeTrue = false;
diff --git a/patches/server/0161-Run-chunk-worker-tasks-on-base-thread-pool.patch b/patches/server/0161-Run-chunk-worker-tasks-on-base-thread-pool.patch
index 845f598..96810fa 100644
--- a/patches/server/0161-Run-chunk-worker-tasks-on-base-thread-pool.patch
+++ b/patches/server/0161-Run-chunk-worker-tasks-on-base-thread-pool.patch
@@ -653,7 +653,7 @@ index 0000000000000000000000000000000000000000..9c36119b03ba9a20dc6994ef2d2704eb
 +
 +}
 diff --git a/src/main/java/org/galemc/gale/executor/thread/BaseThread.java b/src/main/java/org/galemc/gale/executor/thread/BaseThread.java
-index 17ae524053949073fcdcbccc53327c42ba1903c6..a01ce790927ff79071c582ca84d64207fd850dfa 100644
+index f0bf8cfc28107d3f2421d033e45f1a88f8d86d5b..3e293dbd4ea8336a6239df6ee60bff9ddd6a33d3 100644
 --- a/src/main/java/org/galemc/gale/executor/thread/BaseThread.java
 +++ b/src/main/java/org/galemc/gale/executor/thread/BaseThread.java
 @@ -2,6 +2,8 @@
@@ -673,7 +673,7 @@ index 17ae524053949073fcdcbccc53327c42ba1903c6..a01ce790927ff79071c582ca84d64207
  import org.jetbrains.annotations.Nullable;
  
  import java.util.concurrent.TimeUnit;
-@@ -699,6 +702,20 @@ public abstract class BaseThread extends Thread implements AbstractYieldingThrea
+@@ -702,6 +705,20 @@ public abstract class BaseThread extends Thread implements AbstractYieldingThrea
          }
      }