diff --git a/app/soapbox/normalizers/chat_message.ts b/app/soapbox/normalizers/chat_message.ts
index f89af4de2..bdf2653a9 100644
--- a/app/soapbox/normalizers/chat_message.ts
+++ b/app/soapbox/normalizers/chat_message.ts
@@ -25,7 +25,13 @@ export const ChatMessageRecord = ImmutableRecord({
 });
 
 const normalizeMedia = (status: ImmutableMap<string, any>) => {
-  return status.update('attachment', null, normalizeAttachment);
+  const attachment = status.get('attachment');
+
+  if (attachment) {
+    return status.set('attachment', normalizeAttachment(attachment));
+  } else {
+    return status;
+  }
 };
 
 export const normalizeChatMessage = (chatMessage: Record<string, any>) => {