diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 7667f84579..dc559c33a3 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -165,8 +165,10 @@ class Core {
                             " group=" + group +
                             " retry=" + retry);
 
-                    if (ifolder != null && !ifolder.isOpen())
+                    if (ifolder != null && !ifolder.isOpen()) {
                         state.error(new FolderClosedException(ifolder));
+                        break;
+                    }
 
                     // Fetch most recent copy of message
                     EntityMessage message = null;