diff --git a/app/src/main/java/eu/faircode/email/ServiceUI.java b/app/src/main/java/eu/faircode/email/ServiceUI.java
index 61e9d8a0a8..e2870ff4bf 100644
--- a/app/src/main/java/eu/faircode/email/ServiceUI.java
+++ b/app/src/main/java/eu/faircode/email/ServiceUI.java
@@ -299,10 +299,12 @@ public class ServiceUI extends IntentService {
                     Log.e(ex);
                 }
 
-                db.account().setAccountState(account.id, null);
-                db.folder().setFolderState(folder.id, null);
                 Log.i(account.name + " closed");
             }
+
+            db.account().setAccountState(account.id, null);
+            db.folder().setFolderState(folder.id, null);
+            db.folder().setFolderSyncState(folder.id, null);
         }
     }