diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/mentions/MentionsPickerRepository.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/mentions/MentionsPickerRepository.java
index 124f4dfaa7..4d8adad1e9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/mentions/MentionsPickerRepository.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/mentions/MentionsPickerRepository.java
@@ -40,7 +40,7 @@ final class MentionsPickerRepository {
 
   @WorkerThread
   @NonNull List<Recipient> search(@NonNull MentionQuery mentionQuery) {
-    if (mentionQuery.query == null) {
+    if (mentionQuery.query == null || mentionQuery.members.isEmpty()) {
       return Collections.emptyList();
     }