diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index 55836f0cc7..dca1dd0517 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -955,10 +955,6 @@ public class ServiceSynchronize extends LifecycleService {
                     Log.i(account.name + " idle=" + capIdle + " uidplus=" + capUidPlus);
 
                     db.account().setAccountState(account.id, "connected");
-
-                    NotificationManager nm = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
-                    nm.cancel("receive", account.id.intValue());
-
                     EntityLog.log(this, account.name + " connected");
 
                     // Update folder list
@@ -1325,6 +1321,9 @@ public class ServiceSynchronize extends LifecycleService {
                             db.account().setAccountConnected(account.id, last_connected.getTime());
                             db.account().setAccountError(account.id, capIdle ? null : getString(R.string.title_no_idle));
 
+                            NotificationManager nm = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+                            nm.cancel("receive", account.id.intValue());
+
                             // Schedule keep alive alarm
                             EntityLog.log(this, account.name + " wait=" + account.poll_interval);
                             if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M)