diff --git a/src/components/structures/ThreadPanel.tsx b/src/components/structures/ThreadPanel.tsx index 307da0ba2e..c7a87945dd 100644 --- a/src/components/structures/ThreadPanel.tsx +++ b/src/components/structures/ThreadPanel.tsx @@ -81,7 +81,7 @@ const useFilteredThreadsTimelinePanel = ({ // The proper list order should be top-to-bottom, like in social-media newsfeeds. filteredThreads.reverse().forEach(([id, thread]) => { const event = thread.rootEvent; - if (timelineSet.findEventById(event.getId()) || event.status !== null) return; + if (!event || timelineSet.findEventById(event.getId()) || event.status !== null) return; timelineSet.addEventToTimeline( event, timelineSet.getLiveTimeline(),