1 files changed, 9 insertions, 0 deletions
diff --git a/src/main.js b/src/main.js
index b6544a5a..14cb27eb 100644
--- a/src/main.js
+++ b/src/main.js
@@ -125,5 +125,14 @@ window.fetch('/api/pleroma/emoji.json')
     const emoji = Object.keys(values).map((key) => {
       return { shortcode: key, image_url: values[key] }
     })
+    store.dispatch('setOption', { name: 'customEmoji', value: emoji })
+  })
+
+window.fetch('/static/emoji.json')
+  .then((res) => res.json())
+  .then((values) => {
+    const emoji = Object.keys(values).map((key) => {
+      return { shortcode: key, image_url: false, 'utf': values[key] }
+    })
     store.dispatch('setOption', { name: 'emoji', value: emoji })
   })