diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index bd3d13f03d..333d55d8dd 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -4072,12 +4072,6 @@ class Core {
                     " update=" + update.size() +
                     " remove=" + remove.size());
 
-            if (notifications.size() == 0) {
-                String tag = "unseen." + group + "." + 0;
-                EntityLog.log(context, "Notify cancel tag=" + tag);
-                nm.cancel(tag, 1);
-            }
-
             for (Long id : remove) {
                 String tag = "unseen." + group + "." + Math.abs(id);
                 EntityLog.log(context, "Notify cancel tag=" + tag + " id=" + id);
@@ -4087,6 +4081,12 @@ class Core {
                 db.message().setMessageNotifying(Math.abs(id), 0);
             }
 
+            if (notifications.size() == 0) {
+                String tag = "unseen." + group + "." + 0;
+                EntityLog.log(context, "Notify cancel tag=" + tag);
+                nm.cancel(tag, 1);
+            }
+
             for (Long id : add) {
                 data.groupNotifying.get(group).add(id);
                 data.groupNotifying.get(group).remove(-id);