diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index 5878729f3..fa6bb4718 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -232,7 +232,7 @@ const getStickers = async ({ store }) => {
       ).sort((a, b) => {
         return a.meta.title.localeCompare(b.meta.title)
       })
-      useInstanceStore().set({ name: 'stickers', value: stickers })
+      useEmojiStore().setStickers(stickers)
     } else {
       throw res
     }
diff --git a/src/components/emoji_picker/emoji_picker.js b/src/components/emoji_picker/emoji_picker.js
index cf50662cf..a749a326c 100644
--- a/src/components/emoji_picker/emoji_picker.js
+++ b/src/components/emoji_picker/emoji_picker.js
@@ -351,8 +351,8 @@ const EmojiPicker = {
       return this.showingStickers ? '' : this.activeGroup
     },
     stickersAvailable() {
-      if (useInstanceStore().stickers) {
-        return useInstanceStore().stickers.length > 0
+      if (useEmojiStore().stickers) {
+        return useEmojiStore().stickers.length > 0
       }
       return 0
     },
@@ -383,7 +383,7 @@ const EmojiPicker = {
         .concat(this.unicodeEmojiGroups)
     },
     stickerPickerEnabled() {
-      return (useInstanceStore().stickers || []).length !== 0
+      return (useEmojiStore().stickers || []).length !== 0
     },
     debouncedHandleKeywordChange() {
       return debounce(() => {
diff --git a/src/components/sticker_picker/sticker_picker.js b/src/components/sticker_picker/sticker_picker.js
index 6b2d1ed39..6a0732e29 100644
--- a/src/components/sticker_picker/sticker_picker.js
+++ b/src/components/sticker_picker/sticker_picker.js
@@ -17,7 +17,7 @@ const StickerPicker = {
   },
   computed: {
     pack() {
-      return useInstanceStore().stickers || []
+      return useEmojiStore().stickers || []
     },
   },
   methods: {
diff --git a/src/stores/emoji.js b/src/stores/emoji.js
index 38d530549..59e2f540f 100644
--- a/src/stores/emoji.js
+++ b/src/stores/emoji.js
@@ -14,6 +14,9 @@ const defaultState = {
   emoji: {},
   emojiFetched: false,
   unicodeEmojiAnnotations: {},
+
+  // Stickers
+  stickers: null
 }
 
 const SORTED_EMOJI_GROUP_IDS = [
@@ -127,6 +130,9 @@ export const useEmojiStore = defineStore('emoji', {
     },
   },
   actions: {
+    setStickers (stickers) {
+      this.stickers = stickers
+    },
     async getStaticEmoji() {
       try {
         // See build/emojis_plugin for more details