diff --git a/src/libs/EmojiUtils.js b/src/libs/EmojiUtils.js
index 25a9ef630acc..15f1d5301836 100644
--- a/src/libs/EmojiUtils.js
+++ b/src/libs/EmojiUtils.js
@@ -14,7 +14,7 @@ Onyx.connect({
         frequentlyUsedEmojis = _.map(val, (item) => {
             const emoji = Emojis.emojiCodeTable[item.code];
             if (emoji) {
-                return {name: emoji.name, code: emoji.code, count: item.count, lastUpdatedAt: item.lastUpdatedAt};
+                return {...emoji, count: item.count, lastUpdatedAt: item.lastUpdatedAt};
             }
         });
     },
@@ -228,8 +228,7 @@ function getFrequentlyUsedEmojis(newEmoji) {
             frequentEmojiList.splice(emojiIndex, 1);
         }
 
-        const {name, code} = Emojis.emojiCodeTable[emoji.code];
-        const updatedEmoji = {name, code, count: currentEmojiCount, lastUpdatedAt: currentTimestamp};
+        const updatedEmoji = {...Emojis.emojiCodeTable[emoji.code], count: currentEmojiCount, lastUpdatedAt: currentTimestamp};
 
         // We want to make sure the current emoji is added to the list
         // Hence, we take one less than the current frequent used emojis
diff --git a/tests/unit/EmojiTest.js b/tests/unit/EmojiTest.js
index 9b303e9bfb50..0e9b7a7c8c0f 100644
--- a/tests/unit/EmojiTest.js
+++ b/tests/unit/EmojiTest.js
@@ -182,6 +182,7 @@ describe('EmojiTest', () => {
                     name: 'wave',
                     count: 2,
                     lastUpdatedAt: 4,
+                    types: ['👋🏿', '👋🏾', '👋🏽', '👋🏼', '👋🏻'],
                 },
                 {
                     code: '💤',
@@ -234,6 +235,7 @@ describe('EmojiTest', () => {
                     name: 'wave',
                     count: 2,
                     lastUpdatedAt: 4,
+                    types: ['👋🏿', '👋🏾', '👋🏽', '👋🏼', '👋🏻'],
                 },
                 {
                     code: '💤',
@@ -280,6 +282,7 @@ describe('EmojiTest', () => {
                     name: 'wave',
                     count: 2,
                     lastUpdatedAt: 4,
+                    types: ['👋🏿', '👋🏾', '👋🏽', '👋🏼', '👋🏻'],
                 },
                 {...zzzEmoji, count: 2, lastUpdatedAt: 3},
                 {
@@ -329,6 +332,7 @@ describe('EmojiTest', () => {
                     name: 'wave',
                     count: 3,
                     lastUpdatedAt: 23,
+                    types: ['👋🏿', '👋🏾', '👋🏽', '👋🏼', '👋🏻'],
                 },
                 {
                     code: '😡',
@@ -389,6 +393,7 @@ describe('EmojiTest', () => {
                     name: 'baby',
                     count: 3,
                     lastUpdatedAt: 13,
+                    types: ['👶🏿', '👶🏾', '👶🏽', '👶🏼', '👶🏻'],
                 },
                 {
                     code: '👄',