diff --git a/app/soapbox/normalizers/status.ts b/app/soapbox/normalizers/status.ts
index 9b565b14f..90bb27d37 100644
--- a/app/soapbox/normalizers/status.ts
+++ b/app/soapbox/normalizers/status.ts
@@ -127,12 +127,9 @@ const normalizeMention = (mention: ImmutableMap<string, any>) => {
 };
 
 const normalizeMentions = (status: ImmutableMap<string, any>) => {
-  let mentions;
-
-  mentions = status.get('mentions', ImmutableList());
-  mentions = mentions.map(normalizeMention);
-
-  return status.set('mentions', mentions);
+  return status.update('mentions', ImmutableList(), mentions => {
+    return mentions.map(normalizeMention);
+  });
 };
 
 // Normalize emojis