diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index 03cf299c60..fe8799845e 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -1491,6 +1491,10 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
                             Log.w(account.name + " backoff " + ex.toString());
                         }
                     } else {
+                        // Stop retrying when on manual sync
+                        if (account.ondemand)
+                            break;
+
                         // Stop retrying when executing operations only
                         boolean enabled = prefs.getBoolean("enabled", true);
                         if (!enabled)