diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java
index 609e3fc35..f7ba5720e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java
@@ -1153,7 +1153,9 @@ public class ConversationParentFragment extends Fragment
     } else if (container.isInputOpen()) {
       container.hideCurrentInput(composeText);
     } else if (isSearchRequested) {
-      searchViewItem.collapseActionView();
+      if (searchViewItem != null) {
+        searchViewItem.collapseActionView();
+      }
     } else {
       requireActivity().finish();
     }