1 files changed, 9 insertions, 2 deletions
diff --git a/app/assets/javascripts/behaviors/gl_emoji.js b/app/assets/javascripts/behaviors/gl_emoji.js
index 29204020058..8849e9f7a11 100644
--- a/app/assets/javascripts/behaviors/gl_emoji.js
+++ b/app/assets/javascripts/behaviors/gl_emoji.js
@@ -1,4 +1,10 @@
-import { initEmojiMap, getEmojiInfo, emojiFallbackImageSrc, emojiImageTag } from '../emoji';
+import {
+  initEmojiMap,
+  getEmojiInfo,
+  emojiFallbackImageSrc,
+  emojiImageTag,
+  findCustomEmoji,
+} from '../emoji';
 import isEmojiUnicodeSupported from '../emoji/support';
 
 class GlEmoji extends HTMLElement {
@@ -33,6 +39,7 @@ class GlEmoji extends HTMLElement {
         this.childNodes &&
         Array.prototype.every.call(this.childNodes, (childNode) => childNode.nodeType === 3);
 
+      const customEmoji = findCustomEmoji(name);
       const hasImageFallback = fallbackSrc?.length > 0;
       const hasCssSpriteFallback = fallbackSpriteClass?.length > 0;
 
@@ -51,7 +58,7 @@ class GlEmoji extends HTMLElement {
         this.classList.add(fallbackSpriteClass);
       } else if (hasImageFallback) {
         this.innerHTML = '';
-        this.appendChild(emojiImageTag(name, fallbackSrc));
+        this.appendChild(emojiImageTag(name, customEmoji?.src || fallbackSrc));
       } else {
         const src = emojiFallbackImageSrc(name);
         this.innerHTML = '';