diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index df9de76c00..a47a7453b4 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -2032,8 +2032,10 @@ class Core {
         Log.i(account.name + " sync folders=" + sync_folders + " poll=" + sync_folders_poll +
                 " shared=" + sync_shared_folders + " force=" + force);
 
-        if (force || (keep_alive && sync_folders_poll))
+        if (force)
             sync_folders = true;
+        if (keep_alive)
+            sync_folders = sync_folders_poll;
         if (!sync_folders)
             sync_shared_folders = false;
 
diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index 83043022cc..0b0a2a7cbf 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -2047,9 +2047,10 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
                                                     " poll count=" + folder.poll_count +
                                                     " factor=" + folder.poll_factor);
                                         }
-                                Core.onSynchronizeFolders(this,
-                                        account, iservice.getStore(), state,
-                                        true, false);
+                                if (!first)
+                                    Core.onSynchronizeFolders(this,
+                                            account, iservice.getStore(), state,
+                                            true, false);
                             }
                         } catch (Throwable ex) {
                             if (tune) {