diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 7328d65094..651f66d055 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -469,11 +469,12 @@ class Core {
                             ops.remove(op);
                         } else {
                             retry++;
-                            try {
-                                Thread.sleep(OPERATION_RETRY_DELAY);
-                            } catch (InterruptedException ex1) {
-                                Log.w(ex1);
-                            }
+                            if (retry < OPERATION_RETRY_MAX)
+                                try {
+                                    Thread.sleep(OPERATION_RETRY_DELAY);
+                                } catch (InterruptedException ex1) {
+                                    Log.w(ex1);
+                                }
                         }
                     } finally {
                         try {