diff --git a/lib/src/message_input.dart b/lib/src/message_input.dart
index b2d124da..e8e5900a 100644
--- a/lib/src/message_input.dart
+++ b/lib/src/message_input.dart
@@ -674,8 +674,10 @@ class MessageInputState extends State<MessageInput> {
       return null;
     }
 
-    final emojis =
-        _emojiNames.where((e) => e.contains(query)).map((e) => Emoji.byName(e));
+    final emojis = _emojiNames
+        .where((e) => e.contains(query))
+        .map((e) => Emoji.byName(e))
+        .where((e) => e != null);
 
     if (emojis.isEmpty) {
       return null;