diff --git a/src/components/react_button/react_button.js b/src/components/react_button/react_button.js
index 55588894..3ef5dccf 100644
--- a/src/components/react_button/react_button.js
+++ b/src/components/react_button/react_button.js
@@ -64,7 +64,10 @@ const ReactButton = {
       if (this.filterWord !== '') {
         const filterWordLowercase = this.filterWord.toLowerCase()
         let orderedEmojiList = []
-        for (const emoji of this.$store.state.instance.emoji) {
+        for (const emoji of [
+          ...this.$store.state.instance.emoji,
+          ...this.$store.state.instance.customEmoji
+        ]) {
           if (emoji.replacement === this.filterWord) return [emoji]
 
           const indexOfFilterWord = emoji.displayText.toLowerCase().indexOf(filterWordLowercase)
@@ -77,7 +80,10 @@ const ReactButton = {
         }
         return orderedEmojiList.flat()
       }
-      return this.$store.state.instance.emoji || []
+      return [
+        ...this.$store.state.instance.emoji,
+        ...this.$store.state.instance.customEmoji
+      ] || []
     },
     mergedConfig () {
       return this.$store.getters.mergedConfig
diff --git a/src/components/react_button/react_button.vue b/src/components/react_button/react_button.vue
index c23a1ab5..311f45d8 100644
--- a/src/components/react_button/react_button.vue
+++ b/src/components/react_button/react_button.vue
@@ -39,7 +39,14 @@
           :title="emoji.displayText"
           @click="addReaction($event, emoji.replacement, close, keepReactOpen)"
         >
-          {{ emoji.replacement }}
+          <img
+            v-if="emoji.imageUrl !== false"
+            :src="emoji.imageUrl"
+            width="30px"
+          >
+          <span v-else>
+            {{ emoji.replacement }}
+          </span>
         </span>
         <div class="reaction-bottom-fader" />
       </div>