From 7a073791b89d86f50bdfdd88b7d85c124bf3b9ed Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 8 Apr 2022 11:58:16 +0100
Subject: [PATCH 1/2] Fix soft crash around the thread panel in degraded mode

---
 src/components/structures/ThreadPanel.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/structures/ThreadPanel.tsx b/src/components/structures/ThreadPanel.tsx
index 48623616395..cfb9a7a25eb 100644
--- a/src/components/structures/ThreadPanel.tsx
+++ b/src/components/structures/ThreadPanel.tsx
@@ -286,7 +286,7 @@ const ThreadPanel: React.FC<IProps> = ({
                 />
                 { timelineSet && (
                     <TimelinePanel
-                        key={timelineSet.getFilter().filterId}
+                        key={timelineSet.getFilter()?.filterId ?? timelineSet.room.roomId}
                         ref={timelinePanel}
                         showReadReceipts={false} // No RR support in thread's MVP
                         manageReadReceipts={false} // No RR support in thread's MVP

From 07d6a1b4916df7e377603957b2f4ae0225889bc7 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 8 Apr 2022 12:26:38 +0100
Subject: [PATCH 2/2] Better specify fallback key

---
 src/components/structures/ThreadPanel.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/structures/ThreadPanel.tsx b/src/components/structures/ThreadPanel.tsx
index cfb9a7a25eb..03798198adc 100644
--- a/src/components/structures/ThreadPanel.tsx
+++ b/src/components/structures/ThreadPanel.tsx
@@ -286,7 +286,7 @@ const ThreadPanel: React.FC<IProps> = ({
                 />
                 { timelineSet && (
                     <TimelinePanel
-                        key={timelineSet.getFilter()?.filterId ?? timelineSet.room.roomId}
+                        key={timelineSet.getFilter()?.filterId ?? (roomId + ":" + filterOption)}
                         ref={timelinePanel}
                         showReadReceipts={false} // No RR support in thread's MVP
                         manageReadReceipts={false} // No RR support in thread's MVP