diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 2f5238ee4f..7913c289d9 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -153,14 +153,8 @@ export const mutations = {
     state.timelines[timeline].loading = value
   },
   setNsfw (state, { id, nsfw }) {
-    // For now, walk through all the statuses because the stuff might be in the replied_to_status
-    // TODO: Save the replied_tos as references.
-    each(state.allStatuses, (statusoid) => {
-      const status = statusoid.retweeted_status || statusoid
-      if (status.id === id) {
-        status.nsfw = nsfw
-      }
-    })
+    const newStatus = find(state.allStatuses, { id })
+    newStatus.nsfw = nsfw
   }
 }