From 0dd0a71d242190d00139bba426e84d067ee54c75 Mon Sep 17 00:00:00 2001
From: yash-rajpal <rajpal.yash03@gmail.com>
Date: Wed, 15 Oct 2025 21:49:43 +0530
Subject: [PATCH 1/2] fix: client crash on invalid payload

---
 .../message/content/attachments/DefaultAttachment.tsx     | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/apps/meteor/client/components/message/content/attachments/DefaultAttachment.tsx b/apps/meteor/client/components/message/content/attachments/DefaultAttachment.tsx
index 2bf79e8543d6f..89da067a16135 100644
--- a/apps/meteor/client/components/message/content/attachments/DefaultAttachment.tsx
+++ b/apps/meteor/client/components/message/content/attachments/DefaultAttachment.tsx
@@ -86,8 +86,12 @@ const DefaultAttachment = (attachment: DefaultAttachmentProps): ReactElement =>
 
 									return {
 										...rest,
-										title: <MarkdownText variant='inline' parseEmoji content={title.replace(/(.*)/g, (line: string) => `${line}  `)} />,
-										value: <MarkdownText variant='inline' parseEmoji content={value.replace(/(.*)/g, (line: string) => `${line}  `)} />,
+										title: title ? (
+											<MarkdownText variant='inline' parseEmoji content={title.replace(/(.*)/g, (line: string) => `${line}  `)} />
+										) : null,
+										value: value ? (
+											<MarkdownText variant='inline' parseEmoji content={value.replace(/(.*)/g, (line: string) => `${line}  `)} />
+										) : null,
 									};
 								})}
 							/>

From aa2a2ac10269384d246c43225afb7684671715c6 Mon Sep 17 00:00:00 2001
From: yash-rajpal <rajpal.yash03@gmail.com>
Date: Wed, 15 Oct 2025 21:50:54 +0530
Subject: [PATCH 2/2] add changeset

---
 .changeset/chilled-pans-unite.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/chilled-pans-unite.md

diff --git a/.changeset/chilled-pans-unite.md b/.changeset/chilled-pans-unite.md
new file mode 100644
index 0000000000000..d701ef4ddc78b
--- /dev/null
+++ b/.changeset/chilled-pans-unite.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fixes client crash on invalid message attachment fields payload.