From f2bf9619f1d2349115870cb6d153cce00d3fb30f Mon Sep 17 00:00:00 2001
From: Shea <nu@she-a.eu>
Date: Sun, 21 Jun 2026 10:50:49 +0300
Subject: [PATCH] fix sable crashing for specific polls maybe

Signed-off-by: Shea <nu@she-a.eu>
---
 .changeset/fix_some_specific_crash.md       | 5 +++++
 src/app/components/RenderMessageContent.tsx | 2 +-
 src/app/components/message/PollEvent.tsx    | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/fix_some_specific_crash.md

diff --git a/.changeset/fix_some_specific_crash.md b/.changeset/fix_some_specific_crash.md
new file mode 100644
index 000000000..cd31eb633
--- /dev/null
+++ b/.changeset/fix_some_specific_crash.md
@@ -0,0 +1,5 @@
+---
+default: patch
+---
+
+Fix poll crashing sable if interacted with different clients
diff --git a/src/app/components/RenderMessageContent.tsx b/src/app/components/RenderMessageContent.tsx
index 2c381924d..e4e6c6430 100644
--- a/src/app/components/RenderMessageContent.tsx
+++ b/src/app/components/RenderMessageContent.tsx
@@ -463,7 +463,7 @@ function RenderMessageContentInternal({
   if (content['org.matrix.msc3381.poll.start']) {
     if (mEvent && mx && room)
       return <PollEvent content={content} mEvent={mEvent} mx={mx} room={room} />;
-    else return <UnsupportedContent body="abba" />;
+    else return <UnsupportedContent />;
   }
   return (
     <UnsupportedContent
diff --git a/src/app/components/message/PollEvent.tsx b/src/app/components/message/PollEvent.tsx
index 915688400..6e0651c32 100644
--- a/src/app/components/message/PollEvent.tsx
+++ b/src/app/components/message/PollEvent.tsx
@@ -197,7 +197,7 @@ export function PollEvent({ content, mEvent, mx, room }: PollEventProps) {
     let endText = 'The Poll has ended and';
     const winnerArray = answers.filter((item) => votes[item.id] === maxValue);
     if (maxValue === 0) endText += ' nobody voted';
-    else if (winnerArray.length === 1 && winnerArray[0])
+    else if (winnerArray.length === 1 && winnerArray[0] && winnerArray[0][M_TEXT.name])
       endText += `${winnerArray[0][M_TEXT.name]} won`;
     else {
       endText += ': ';