diff --git a/app/src/main/java/eu/faircode/email/FragmentAccount.java b/app/src/main/java/eu/faircode/email/FragmentAccount.java
index f17a1cabc8..e92af96601 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAccount.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAccount.java
@@ -962,9 +962,11 @@ public class FragmentAccount extends FragmentBase {
                     EntityLog.log(context, (update ? "Updated" : "Added") + " account=" + account.name);
 
                     // Make sure the channel exists on commit
-                    if (account.notify)
+                    if (account.notify) {
+                        // Add or update notification channel
+                        account.deleteNotificationChannel(context);
                         account.createNotificationChannel(context);
-                    else if (!account.synchronize)
+                    } else if (!account.synchronize)
                         account.deleteNotificationChannel(context);
 
                     List<EntityFolder> folders = new ArrayList<>();