diff --git a/src/components/structures/ThreadView.tsx b/src/components/structures/ThreadView.tsx
index 4f992c4f434..71efae0c6a9 100644
--- a/src/components/structures/ThreadView.tsx
+++ b/src/components/structures/ThreadView.tsx
@@ -165,11 +165,11 @@ export default class ThreadView extends React.Component<IProps, IState> {
         if (thread && this.state.thread !== thread) {
             this.setState({
                 thread,
+            }, () => {
+                thread.emit(ThreadEvent.ViewThread);
+                this.timelinePanelRef.current?.refreshTimeline();
             });
-            thread.emit(ThreadEvent.ViewThread);
         }
-
-        this.timelinePanelRef.current?.refreshTimeline();
     };
 
     private onScroll = (): void => {