diff --git a/app/src/main/java/eu/faircode/email/WorkerCleanup.java b/app/src/main/java/eu/faircode/email/WorkerCleanup.java
index f594562704..9b1493d596 100644
--- a/app/src/main/java/eu/faircode/email/WorkerCleanup.java
+++ b/app/src/main/java/eu/faircode/email/WorkerCleanup.java
@@ -101,6 +101,10 @@ public class WorkerCleanup extends Worker {
 
                 int headers = db.message().clearMessageHeaders();
                 Log.i("Cleared message headers=" + headers);
+
+                // Clear last search
+                SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+                prefs.edit().remove("last_search").apply();
             }
 
             long now = new Date().getTime();