diff --git a/src/components/structures/ThreadPanel.tsx b/src/components/structures/ThreadPanel.tsx
index eae620192b..5d272827e9 100644
--- a/src/components/structures/ThreadPanel.tsx
+++ b/src/components/structures/ThreadPanel.tsx
@@ -172,6 +172,7 @@ const ThreadPanel: React.FC<IProps> = ({
         room.createThreadsTimelineSets().then(() => {
             setRoom(room);
             setFilterOption(ThreadFilterType.All);
+            room.fetchRoomThreads();
         });
     }, [mxClient, roomId]);
 
diff --git a/src/components/views/rooms/EventTile.tsx b/src/components/views/rooms/EventTile.tsx
index 4b7fa122aa..b73ec31e29 100644
--- a/src/components/views/rooms/EventTile.tsx
+++ b/src/components/views/rooms/EventTile.tsx
@@ -501,7 +501,9 @@ export class UnwrappedEventTile extends React.Component<IProps, IState> {
             }
         }
 
-        const room = MatrixClientPeg.get().getRoom(this.props.mxEvent.getRoomId());
+        client.decryptEventIfNeeded(this.props.mxEvent);
+
+        const room = client.getRoom(this.props.mxEvent.getRoomId());
         room?.on(ThreadEvent.New, this.onNewThread);
     }