diff --git a/app/src/main/java/eu/faircode/email/SimpleTask.java b/app/src/main/java/eu/faircode/email/SimpleTask.java
index e75d79a0a7..3fce3275a7 100644
--- a/app/src/main/java/eu/faircode/email/SimpleTask.java
+++ b/app/src/main/java/eu/faircode/email/SimpleTask.java
@@ -70,7 +70,6 @@ public abstract class SimpleTask<T> implements LifecycleObserver {
     @SuppressLint("StaticFieldLeak")
     private static Context themedContext = null;
     private static final List<SimpleTask> tasks = new ArrayList<>();
-    private static final ExecutorService globalExecutor = Helper.getBackgroundExecutor(0, "tasks");
 
     private static final int REPORT_AFTER = 15 * 60 * 1000; // milliseconds
 
@@ -125,7 +124,10 @@ public abstract class SimpleTask<T> implements LifecycleObserver {
             wl = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, BuildConfig.APPLICATION_ID + ":task");
         }
 
-        return (localExecutor == null ? globalExecutor : localExecutor);
+        if (localExecutor != null)
+            return localExecutor;
+
+        return Helper.getParallelExecutor();
     }
 
     @NonNull