diff --git a/app/components/autocomplete/emoji_suggestion/emoji_suggestion.js b/app/components/autocomplete/emoji_suggestion/emoji_suggestion.js
index 8f6d14402..fce8fc4dc 100644
--- a/app/components/autocomplete/emoji_suggestion/emoji_suggestion.js
+++ b/app/components/autocomplete/emoji_suggestion/emoji_suggestion.js
@@ -129,7 +129,11 @@ export default class EmojiSuggestion extends PureComponent {
 
             const emojiData = getEmojiByName(emoji);
             if (emojiData?.filename && !BuiltInEmojis.includes(emojiData.filename)) {
-                completedDraft = emojiPart.replace(EMOJI_REGEX_WITHOUT_PREFIX, String.fromCodePoint(parseInt(emojiData.filename, 16)));
+                const codeArray = emojiData.filename.split('-');
+                const code = codeArray.reduce((acc, c) => {
+                    return acc + String.fromCodePoint(parseInt(c, 16));
+                }, '');
+                completedDraft = emojiPart.replace(EMOJI_REGEX_WITHOUT_PREFIX, `${code} `);
             } else {
                 completedDraft = emojiPart.replace(EMOJI_REGEX_WITHOUT_PREFIX, `${prefix}${emoji}: `);
             }