diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js
index a894348af..696167831 100644
--- a/src/components/conversation/conversation.js
+++ b/src/components/conversation/conversation.js
@@ -358,6 +358,9 @@ const conversation = {
     canDive() {
       return this.isTreeView && this.isExpanded
     },
+    maybeHighlight() {
+      return this.isExpanded ? this.highlight : null
+    },
     ...mapPiniaState(useMergedConfigStore, ['mergedConfig']),
     ...mapState({
       mastoUserSocketStatus: (state) => state.api.mastoUserSocketStatus,
@@ -432,7 +435,7 @@ const conversation = {
     getReplies(id) {
       return this.replies[id] || []
     },
-    maybeHighlight() {
+    getHighlight() {
       return this.isExpanded ? this.highlight : null
     },
     setHighlight(id) {
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 6b71fa5e9..5bc852be1 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -883,11 +883,9 @@ const statuses = {
           'addNewUsers',
           data.statuses.map((s) => s.user).filter((u) => u),
         )
-        store.commit('addNewStatuses', {
+        data.statuses = store.dispatch('addNewStatuses', {
           statuses: data.statuses,
         })
-
-        data.statuses = data.statuses.map((s) => store.state.allStatusesObject[s.id])
         return data
       })
     },