diff --git a/lib/pangea/lemmas/lemma_emoji_picker.dart b/lib/pangea/lemmas/lemma_emoji_picker.dart
index d3c20b2fa..c99a79214 100644
--- a/lib/pangea/lemmas/lemma_emoji_picker.dart
+++ b/lib/pangea/lemmas/lemma_emoji_picker.dart
@@ -4,7 +4,7 @@ import 'package:fluffychat/pangea/toolbar/reading_assistance_input_row/lemma_emo
 
 class LemmaEmojiPicker extends StatelessWidget {
   final List<String> emojis;
-  final Function(String) onSelect;
+  final Function(String)? onSelect;
 
   final bool loading;
   final Function(String)? disabled;
@@ -36,7 +36,9 @@ class LemmaEmojiPicker extends StatelessWidget {
                   opacity: isDisabled ? 0.33 : 1,
                   child: LemmaEmojiChoiceItem(
                     content: emoji,
-                    onTap: isDisabled ? null : () => onSelect(emoji),
+                    onTap: isDisabled || onSelect == null
+                        ? null
+                        : () => onSelect!(emoji),
                   ),
                 );
               }).toList(),
diff --git a/lib/pangea/lemmas/lemma_reaction_picker.dart b/lib/pangea/lemmas/lemma_reaction_picker.dart
index 6f3e2ab92..cf72c433f 100644
--- a/lib/pangea/lemmas/lemma_reaction_picker.dart
+++ b/lib/pangea/lemmas/lemma_reaction_picker.dart
@@ -75,7 +75,7 @@ class LemmaReactionPicker extends StatelessWidget {
 
     return LemmaEmojiPicker(
       emojis: emojis,
-      onSelect: (emoji) => setEmoji(emoji, context),
+      onSelect: event != null ? (emoji) => setEmoji(emoji, context) : null,
       disabled: (emoji) => sentReactions.contains(emoji),
       loading: loading,
     );