diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index e3f95b7af0..1a41736e3c 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -1004,7 +1004,7 @@ public class ServiceSynchronize extends ServiceBase {
                                 public void run() {
                                     try {
                                         Log.i(folder.name + " start idle");
-                                        while (state.isRunning() && state.isRecoverable()) {
+                                        while (ifolder.isOpen() && state.isRunning() && state.isRecoverable()) {
                                             Log.i(folder.name + " do idle");
                                             ifolder.idle(false);
                                         }