diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index 7a945c33fb..2563025e8a 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -429,6 +429,8 @@ public class ServiceSynchronize extends LifecycleService {
                 }
 
                 // Synchronize folders
+                for (EntityFolder folder : db.folder().getFolders(account.id))
+                    db.folder().setFolderState(folder.id, null);
                 for (final EntityFolder folder : db.folder().getFolders(account.id, true))
                     try {
                         Log.i(Helper.TAG, account.name + " sync folder " + folder.name);