diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
index a4c9cb7cbe..a9d4be19a8 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
@@ -726,7 +726,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     SearchView.OnQueryTextListener queryListener = new SearchView.OnQueryTextListener() {
       @Override
       public boolean onQueryTextSubmit(String query) {
-        searchViewModel.onQueryUpdated(query, threadId);
+        searchViewModel.onQueryUpdated(query, threadId, true);
         searchNav.showLoading();
         fragment.onSearchQueryUpdated(query);
         return true;
@@ -734,7 +734,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
 
       @Override
       public boolean onQueryTextChange(String query) {
-        searchViewModel.onQueryUpdated(query, threadId);
+        searchViewModel.onQueryUpdated(query, threadId, false);
         searchNav.showLoading();
         fragment.onSearchQueryUpdated(query);
         return true;
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationSearchViewModel.java b/src/org/thoughtcrime/securesms/conversation/ConversationSearchViewModel.java
index 76bb06b28f..56e8e45132 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationSearchViewModel.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationSearchViewModel.java
@@ -48,13 +48,13 @@ public class ConversationSearchViewModel extends AndroidViewModel {
     return result;
   }
 
-  void onQueryUpdated(@NonNull String query, long threadId) {
+  void onQueryUpdated(@NonNull String query, long threadId, boolean forced) {
     if (firstSearch && query.length() < 2) {
       result.postValue(new SearchResult(CursorList.emptyList(), 0));
       return;
     }
 
-    if (query.equals(activeQuery)) {
+    if (query.equals(activeQuery) && !forced) {
       return;
     }