diff --git a/addons/mail/static/src/models/emoji_category.js b/addons/mail/static/src/models/emoji_category.js
index a2fef3cbf21..fdd134e6241 100644
--- a/addons/mail/static/src/models/emoji_category.js
+++ b/addons/mail/static/src/models/emoji_category.js
@@ -15,9 +15,6 @@ registerModel({
         allEmojis: many('Emoji', {
             inverse: 'emojiCategories',
         }),
-        emojiCount: attr({ //Number of emojis that will be in that category once every emoji is loaded.
-            default: 0,
-        }),
         emojiRegistry: one("EmojiRegistry", {
             compute() {
                 return this.messaging.emojiRegistry;
diff --git a/addons/mail/static/src/models/emoji_registry.js b/addons/mail/static/src/models/emoji_registry.js
index 2b69d7e4de0..ecf87505113 100644
--- a/addons/mail/static/src/models/emoji_registry.js
+++ b/addons/mail/static/src/models/emoji_registry.js
@@ -19,13 +19,11 @@ registerModel({
         },
         async _populateFromEmojiData(dataCategories, dataEmojis) {
             dataCategories.map(category => {
-                const emojiCount = dataEmojis.reduce((acc, emoji) => emoji.category === category.name ? acc + 1 : acc, 0);
                 this.update({
                     dataCategories: insert({
                         name: category.name,
                         title: category.title,
                         sortId: category.sortId,
-                        emojiCount,
                     }),
                 });
             });
diff --git a/addons/mail/static/src/models/emoji_view.js b/addons/mail/static/src/models/emoji_view.js
index 43f0400e373..b24ca5b33bb 100644
--- a/addons/mail/static/src/models/emoji_view.js
+++ b/addons/mail/static/src/models/emoji_view.js
@@ -14,12 +14,12 @@ registerModel({
             if (!this.emojiGridItemViewOwner.emojiGridRowViewOwner) {
                 return;
             }
-            if (this.emojiGridItemViewOwner.emojiGridRowViewOwner.emojiGridViewOwner.emojiPickerViewOwner.popoverViewOwner.messageActionViewOwnerAsReaction) {
-                this.emojiGridItemViewOwner.emojiGridRowViewOwner.emojiGridViewOwner.emojiPickerViewOwner.popoverViewOwner.messageActionViewOwnerAsReaction.onClickReaction(ev);
+            if (this.emojiPickerViewOwner.popoverViewOwner.messageActionViewOwnerAsReaction) {
+                this.emojiPickerViewOwner.popoverViewOwner.messageActionViewOwnerAsReaction.onClickReaction(ev);
                 return;
             }
-            if (this.emojiGridItemViewOwner.emojiGridRowViewOwner.emojiGridViewOwner.emojiPickerViewOwner.popoverViewOwner.composerViewOwnerAsEmoji) {
-                this.emojiGridItemViewOwner.emojiGridRowViewOwner.emojiGridViewOwner.emojiPickerViewOwner.popoverViewOwner.composerViewOwnerAsEmoji.onClickEmoji(ev);
+            if (this.emojiPickerViewOwner.popoverViewOwner.composerViewOwnerAsEmoji) {
+                this.emojiPickerViewOwner.popoverViewOwner.composerViewOwnerAsEmoji.onClickEmoji(ev);
                 return;
             }
         },
@@ -54,5 +54,10 @@ registerModel({
         emojiGridViewAsHovered: one('EmojiGridView', {
             inverse: 'hoveredEmojiView',
         }),
+        emojiPickerViewOwner: one('EmojiPickerView', {
+            compute() {
+                return this.emojiGridItemViewOwner.emojiGridRowViewOwner.emojiGridViewOwner.emojiPickerViewOwner;
+            }
+        })
     },
 });