diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyboard/emoji/search/EmojiSearchRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/keyboard/emoji/search/EmojiSearchRepository.kt
index 109755be9e..8a3986cfe3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/keyboard/emoji/search/EmojiSearchRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/keyboard/emoji/search/EmojiSearchRepository.kt
@@ -18,7 +18,7 @@ private const val MINIMUM_QUERY_THRESHOLD = 1
 private const val MINIMUM_INLINE_QUERY_THRESHOLD = 2
 private const val EMOJI_SEARCH_LIMIT = 20
 
-private val NOT_PUNCTUATION = "[A-Za-z0-9 ]".toRegex()
+private val NOT_PUNCTUATION = "[^\\p{Punct}]".toRegex()
 
 class EmojiSearchRepository(private val context: Context) {