diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index 5050baf1e2..661a7101e3 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -965,6 +965,10 @@ public class ServiceSynchronize extends LifecycleService {
 
                         if (!istore.isConnected())
                             throw new StoreClosedException(istore);
+
+                        for (EntityFolder folder : folders.keySet())
+                            if (!folders.get(folder).isOpen())
+                                throw new FolderClosedException(folders.get(folder));
                     }
                     Log.i(Helper.TAG, account.name + " done running=" + state.running);
                 } finally {