diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationFragment.java b/src/org/thoughtcrime/securesms/conversation/ConversationFragment.java
index f35808bba1..43a7fbc76d 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationFragment.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationFragment.java
@@ -745,7 +745,9 @@ public class ConversationFragment extends Fragment
   }
 
   public void onSearchQueryUpdated(@Nullable String query) {
-    getListAdapter().onSearchQueryUpdated(query);
+    if (getListAdapter() != null) {
+      getListAdapter().onSearchQueryUpdated(query);
+    }
   }
 
   public void jumpToMessage(@NonNull Address author, long timestamp, @Nullable Runnable onMessageNotFound) {