diff --git a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
index 9c20291519..9d44d4b2e2 100644
--- a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
+++ b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
@@ -405,6 +405,8 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
                                                     true,
                                                     state.ifolder.getPermanentFlags(),
                                                     browsable.keywords);
+                                            if (terms == null)
+                                                return new Message[0];
 
                                             SearchSequence ss = new SearchSequence(protocol);
                                             Argument args = ss.generateSequence(terms, StandardCharsets.UTF_8.name());
@@ -439,6 +441,8 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
                                             false,
                                             state.ifolder.getPermanentFlags(),
                                             browsable.keywords);
+                                    if (terms == null)
+                                        return new Message[0];
                                     return state.ifolder.search(terms);
                                 }
                             } catch (MessagingException ex) {