diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 2b859dcc90..2b0b275b53 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -2439,6 +2439,8 @@ class Core {
                 " connected=" + (ifolder != null));
 
         if (!EntityFolder.INBOX.equals(folder.type)) {
+            folder.synchronize = false;
+            db.folder().setFolderSynchronize(folder.id, folder.synchronize);
             db.folder().setFolderSyncState(folder.id, null);
             return;
         }
@@ -2851,6 +2853,7 @@ class Core {
             if (folder.local) {
                 folder.synchronize = false;
                 db.folder().setFolderSynchronize(folder.id, folder.synchronize);
+                db.folder().setFolderSyncState(folder.id, null);
                 return;
             }