diff --git a/core-util/src/main/java/org/signal/core/util/concurrent/DeadlockDetector.kt b/core-util/src/main/java/org/signal/core/util/concurrent/DeadlockDetector.kt
index cb542b9c36..43fd2b2a3b 100644
--- a/core-util/src/main/java/org/signal/core/util/concurrent/DeadlockDetector.kt
+++ b/core-util/src/main/java/org/signal/core/util/concurrent/DeadlockDetector.kt
@@ -59,7 +59,7 @@ class DeadlockDetector(private val handler: Handler, private val pollingInterval
           .toMap()
 
         val executor: ThreadPoolExecutor = executorInfo.executor as ThreadPoolExecutor
-        Log.w(TAG, buildLogString("Found a full executor! ${executor.activeCount}/${executor.corePoolSize} threads active with ${executor.queue.size} tasks queued.", fullMap))
+        Log.w(TAG, buildLogString("Found a full executor! ${executor.activeCount}/${executor.maximumPoolSize} threads active with ${executor.queue.size} tasks queued.", fullMap))
 
         val runnableStringBuilder = StringBuilder()
         executor.queue.forEach { runnable ->
diff --git a/core-util/src/main/java/org/signal/core/util/concurrent/SignalExecutors.java b/core-util/src/main/java/org/signal/core/util/concurrent/SignalExecutors.java
index d3660e43a0..01f9bef0c4 100644
--- a/core-util/src/main/java/org/signal/core/util/concurrent/SignalExecutors.java
+++ b/core-util/src/main/java/org/signal/core/util/concurrent/SignalExecutors.java
@@ -17,7 +17,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 public final class SignalExecutors {
 
   public static final ExecutorService UNBOUNDED  = Executors.newCachedThreadPool(new NumberedThreadFactory("signal-unbounded"));
-  public static final ExecutorService BOUNDED    = Executors.newFixedThreadPool(getIdealThreadCount(), new NumberedThreadFactory("signal-bounded"));
+  public static final ExecutorService BOUNDED    = new ThreadPoolExecutor(4, 12, 5, TimeUnit.SECONDS, new LinkedBlockingQueue<>(), new NumberedThreadFactory("signal-bounded"));
   public static final ExecutorService SERIAL     = Executors.newSingleThreadExecutor(new NumberedThreadFactory("signal-serial"));
   public static final ExecutorService BOUNDED_IO = newCachedBoundedExecutor("signal-io-bounded", 1, 32);
 
@@ -81,13 +81,6 @@ public final class SignalExecutors {
     return handlerThread;
   }
 
-  /**
-   * Returns an 'ideal' thread count based on the number of available processors.
-   */
-  public static int getIdealThreadCount() {
-    return Math.max(2, Math.min(Runtime.getRuntime().availableProcessors() - 1, 4));
-  }
-
   private static class NumberedThreadFactory implements ThreadFactory {
 
     private final String        baseName;