diff --git a/app/src/main/java/eu/faircode/email/ApplicationEx.java b/app/src/main/java/eu/faircode/email/ApplicationEx.java
index 3dd5b737fc..3e2264e39a 100644
--- a/app/src/main/java/eu/faircode/email/ApplicationEx.java
+++ b/app/src/main/java/eu/faircode/email/ApplicationEx.java
@@ -192,9 +192,6 @@ public class ApplicationEx extends Application {
                 editor.putBoolean("enabled", true);
         }
 
-        if (version < BuildConfig.VERSION_CODE)
-            editor.putBoolean("vacuum", true);
-
         if (BuildConfig.DEBUG && false) {
             editor.remove("app_support");
             editor.remove("notify_archive");
diff --git a/app/src/main/java/eu/faircode/email/WorkerCleanup.java b/app/src/main/java/eu/faircode/email/WorkerCleanup.java
index 0ccca3eeb7..12c8698e94 100644
--- a/app/src/main/java/eu/faircode/email/WorkerCleanup.java
+++ b/app/src/main/java/eu/faircode/email/WorkerCleanup.java
@@ -107,7 +107,10 @@ public class WorkerCleanup extends Worker {
 
                 // Clear last search
                 SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-                prefs.edit().remove("last_search").apply();
+                prefs.edit()
+                        .remove("last_search")
+                        .putBoolean("vacuum", true)
+                        .apply();
             }
 
             long now = new Date().getTime();