diff --git a/src/components/structures/ThreadPanel.tsx b/src/components/structures/ThreadPanel.tsx
index ea842454a95..793b6f93f5c 100644
--- a/src/components/structures/ThreadPanel.tsx
+++ b/src/components/structures/ThreadPanel.tsx
@@ -305,7 +305,7 @@ const ThreadPanel: React.FC<IProps> = ({ roomId, onClose, permalinkCreator }) =>
                 <Measured sensor={card.current} onMeasurement={setNarrow} />
                 {timelineSet ? (
                     <TimelinePanel
-                        key={timelineSet.getFilter()?.filterId ?? roomId + ":" + filterOption}
+                        key={filterOption + ":" + (timelineSet.getFilter()?.filterId ?? roomId)}
                         ref={timelinePanel}
                         showReadReceipts={false} // No RR support in thread's list
                         manageReadReceipts={false} // No RR support in thread's list