diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 25285d36ab..89f6cd84db 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -512,7 +512,7 @@ class Core {
                             db.endTransaction();
                         }
 
-                        if (similar.size() > 0) {
+                        if (similar.size() > 0 && op.tries < TOTAL_RETRY_MAX) {
                             // Retry individually
                             group = false;
                             // Finally will reset state