diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 7119f1f611..1665d2d159 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -530,8 +530,10 @@ class Core {
 
             if (ops.size() == 0)
                 state.batchCompleted(folder.id, priority, sequence);
-            else
-                state.error(new OperationCanceledException("Processing"));
+            else {
+                if (state.batchCanRun(folder.id, priority, sequence))
+                    state.error(new OperationCanceledException("Processing"));
+            }
         } finally {
             Log.i(folder.name + " end process state=" + state + " pending=" + ops.size());
         }