diff --git a/src/api/user.js b/src/api/user.js
index ce9da977d..4b63808a0 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -143,14 +143,14 @@ export const bookmarkStatus = ({ id, credentials, ...options }) =>
     payload: {
       folder_id: options.folder_id,
     },
-  })
+  }).then(({ data, ...rest }) => ({ ...rest, data: parseStatus(data) }))
 
 export const unbookmarkStatus = ({ id, credentials }) =>
   promisedRequest({
     url: MASTODON_UNBOOKMARK_STATUS_URL(id),
     credentials,
     method: 'POST',
-  })
+  }).then(({ data, ...rest }) => ({ ...rest, data: parseStatus(data) }))
 
 export const pinOwnStatus = ({ id, credentials }) =>
   promisedRequest({
diff --git a/src/components/emoji_reactions/emoji_reactions.js b/src/components/emoji_reactions/emoji_reactions.js
index f8b121232..f881036df 100644
--- a/src/components/emoji_reactions/emoji_reactions.js
+++ b/src/components/emoji_reactions/emoji_reactions.js
@@ -67,10 +67,10 @@ const EmojiReactions = {
       }
     },
     reactWith(emoji) {
-      this.$store.dispatch('reactWithEmoji', { id: this.status.id, emoji })
+      useStatusesStore().reactWithEmoji(this.status.id, emoji)
     },
     unreact(emoji) {
-      this.$store.dispatch('unreactWithEmoji', { id: this.status.id, emoji })
+      useStatusesStore().unreactWithEmoji(this.status.id, emoji)
     },
     async emojiOnClick(emoji) {
       if (!this.loggedIn) return
diff --git a/src/components/status_action_buttons/action_button.js b/src/components/status_action_buttons/action_button.js
index f962a9029..ba4c1c9e5 100644
--- a/src/components/status_action_buttons/action_button.js
+++ b/src/components/status_action_buttons/action_button.js
@@ -6,6 +6,7 @@ import { useInstanceStore } from 'src/stores/instance.js'
 import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
 import { useUsersStore } from 'src/stores/users.js'
+import { useStatusesStore } from 'src/stores/statuses.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
@@ -140,9 +141,9 @@ export default {
         (r) => r.name === emoji,
       )
       if (existingReaction?.me) {
-        this.$store.dispatch('unreactWithEmoji', { id: this.status.id, emoji })
+        useStatusesStore().unreactWithEmoji(this.status.id, emoji)
       } else {
-        this.$store.dispatch('reactWithEmoji', { id: this.status.id, emoji })
+        useStatusesStore().reactWithEmoji(this.status.id, emoji)
       }
     },
     onShowEmojiPicker() {
diff --git a/src/stores/users.js b/src/stores/users.js
index 009d86c26..e95b31034 100644
--- a/src/stores/users.js
+++ b/src/stores/users.js
@@ -740,7 +740,6 @@ export const useUsersStore = defineStore('users', {
               dispatch('startFetchingFollowRequests')
             }
 
-            useStreamingStore().initSocket(true)
             if (useMergedConfigStore().mergedConfig.useStreamingApi) {
               useStreamingStore().initSocket(true)
             }