diff --git a/ts/components/StoryViewsNRepliesModal.tsx b/ts/components/StoryViewsNRepliesModal.tsx
index 068df05c8..0b90d36d3 100644
--- a/ts/components/StoryViewsNRepliesModal.tsx
+++ b/ts/components/StoryViewsNRepliesModal.tsx
@@ -146,12 +146,9 @@ export const StoryViewsNRepliesModal = ({
 
   const insertEmoji = useCallback(
     (e: EmojiPickDataType) => {
-      if (inputApiRef.current) {
-        inputApiRef.current.insertEmoji(e);
-        onUseEmoji(e);
-      }
+      onUseEmoji(e);
     },
-    [inputApiRef, onUseEmoji]
+    [onUseEmoji]
   );
 
   const [referenceElement, setReferenceElement] =
diff --git a/ts/components/emoji/EmojiPicker.tsx b/ts/components/emoji/EmojiPicker.tsx
index c5bdb3195..fb1529c51 100644
--- a/ts/components/emoji/EmojiPicker.tsx
+++ b/ts/components/emoji/EmojiPicker.tsx
@@ -152,8 +152,7 @@ export const EmojiPicker = React.memo(
                 doSend();
                 e.stopPropagation();
                 e.preventDefault();
-              }
-              if (shortName) {
+              } else if (shortName) {
                 onPickEmoji({ skinTone: selectedTone, shortName });
                 e.stopPropagation();
                 e.preventDefault();