diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index df4d2e9f4f..c14fd04eda 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -1748,10 +1748,10 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
                                 }
 
                                 // Autofix too many simultaneous connections
-                                boolean auto_optimize = prefs.getBoolean("auto_optimize", false);
-                                if (auto_optimize &&
-                                        ConnectionHelper.isMaxConnections(last_fail)) {
-                                    if (account.last_connected == null ||
+                                if (ConnectionHelper.isMaxConnections(last_fail)) {
+                                    boolean auto_optimize = prefs.getBoolean("auto_optimize", false);
+                                    if (auto_optimize ||
+                                            account.last_connected == null ||
                                             now - account.last_connected > AUTOFIX_TOO_MANY_FOLDERS) {
                                         int user = 0;
                                         int system = 0;