diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/EmojiSearchDatabase.kt b/app/src/main/java/org/thoughtcrime/securesms/database/EmojiSearchDatabase.kt
index bbca80b1ae..2a358ed732 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/EmojiSearchDatabase.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/EmojiSearchDatabase.kt
@@ -55,6 +55,7 @@ class EmojiSearchDatabase(context: Context, databaseHelper: SignalDatabase) : Da
       .sortedWith { lhs, rhs ->
         similarityScore(query, lhs.label) - similarityScore(query, rhs.label)
       }
+      .distinctBy { it.emoji }
       .take(originalLimit)
       .map { it.emoji }
   }