diff --git a/app/src/main/java/eu/faircode/email/DaoMessage.java b/app/src/main/java/eu/faircode/email/DaoMessage.java
index 7b92414bfc..773858401a 100644
--- a/app/src/main/java/eu/faircode/email/DaoMessage.java
+++ b/app/src/main/java/eu/faircode/email/DaoMessage.java
@@ -436,6 +436,9 @@ public interface DaoMessage {
             " WHERE id = :id")
     int setMessageSnoozed(long id, Long wakeup);
 
+    @Query("UPDATE message SET notifying = 0")
+    int clearNotifyingMessages();
+
     @Query("DELETE FROM message WHERE id = :id")
     int deleteMessage(long id);
 
diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index abf407413f..49efbbd7bc 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -1387,6 +1387,9 @@ public class ServiceSynchronize extends LifecycleService {
                     try {
                         DB db = DB.getInstance(context);
 
+                        // Restore notifications
+                        db.message().clearNotifyingMessages();
+
                         // Restore snooze timers
                         for (EntityMessage message : db.message().getSnoozed())
                             EntityMessage.snooze(context, message.id, message.ui_snoozed);