diff --git a/app/src/main/java/eu/faircode/email/DaoOperation.java b/app/src/main/java/eu/faircode/email/DaoOperation.java
index 88703734f1..616bca9c21 100644
--- a/app/src/main/java/eu/faircode/email/DaoOperation.java
+++ b/app/src/main/java/eu/faircode/email/DaoOperation.java
@@ -127,6 +127,9 @@ public interface DaoOperation {
     @Query("UPDATE operation SET state = :state WHERE id = :id")
     int setOperationState(long id, String state);
 
+    @Query("UPDATE operation SET state = NULL")
+    int resetOperationStates();
+
     @Query("UPDATE operation SET error = :error WHERE id = :id")
     int setOperationError(long id, String error);
 
diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index e51c87ecff..e1afbb8335 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -1678,6 +1678,9 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
                             db.folder().setFolderSyncState(folder.id, null);
                         }
 
+                        // Reset operations
+                        db.operation().resetOperationStates();
+
                         // Restore notifications
                         db.message().clearNotifyingMessages();