diff --git a/app/src/main/java/eu/faircode/email/WorkerCleanup.java b/app/src/main/java/eu/faircode/email/WorkerCleanup.java
index df41e10708..e5e1f57956 100644
--- a/app/src/main/java/eu/faircode/email/WorkerCleanup.java
+++ b/app/src/main/java/eu/faircode/email/WorkerCleanup.java
@@ -262,7 +262,9 @@ public class WorkerCleanup extends Worker {
                     }
 
             // Cleanup contact info
-            if (!manual)
+            if (manual)
+                ContactInfo.clearCache(context, true);
+            else
                 ContactInfo.cleanup(context);
 
             Log.i("Cleanup FTS=" + fts);