diff --git a/src/components/middle/composer/AttachmentModal.tsx b/src/components/middle/composer/AttachmentModal.tsx
index 28d7f2c10..b972f1acb 100644
--- a/src/components/middle/composer/AttachmentModal.tsx
+++ b/src/components/middle/composer/AttachmentModal.tsx
@@ -31,6 +31,7 @@ export type OwnProps = {
   groupChatMembers?: ApiChatMember[];
   usersById?: Record<number, ApiUser>;
   recentEmojis: string[];
+  baseEmojiKeywords?: Record<string, string[]>;
   emojiKeywords?: Record<string, string[]>;
   addRecentEmoji: AnyToVoidFunction;
   onCaptionUpdate: (html: string) => void;
@@ -49,6 +50,7 @@ const AttachmentModal: FC<OwnProps> = ({
   currentUserId,
   usersById,
   recentEmojis,
+  baseEmojiKeywords,
   emojiKeywords,
   onCaptionUpdate,
   addRecentEmoji,
@@ -86,6 +88,7 @@ const AttachmentModal: FC<OwnProps> = ({
     recentEmojis,
     EDITABLE_INPUT_MODAL_ID,
     onCaptionUpdate,
+    baseEmojiKeywords,
     emojiKeywords,
   );
 
diff --git a/src/components/middle/composer/Composer.tsx b/src/components/middle/composer/Composer.tsx
index c85b5f5de..056b9d8d7 100644
--- a/src/components/middle/composer/Composer.tsx
+++ b/src/components/middle/composer/Composer.tsx
@@ -718,6 +718,7 @@ const Composer: FC<OwnProps & StateProps & DispatchProps> = ({
         usersById={usersById}
         recentEmojis={recentEmojis}
         onCaptionUpdate={setHtml}
+        baseEmojiKeywords={baseEmojiKeywords}
         emojiKeywords={emojiKeywords}
         addRecentEmoji={addRecentEmoji}
         onSend={shouldSchedule ? openCalendar : handleSend}