diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index b8754272a8..ffdfdb80ba 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -248,6 +248,10 @@ class Core {
                             // There is no use in repeating
                             db.operation().deleteOperation(op.id);
 
+                            // Cleanup
+                            if (EntityOperation.SYNC.equals(op.name))
+                                db.folder().setFolderSyncState(folder.id, null);
+
                             // Cleanup
                             if (message != null) {
                                 if (ex instanceof MessageRemovedException)