diff --git a/src/components/structures/EmbeddedPage.tsx b/src/components/structures/EmbeddedPage.tsx
index c0d7835747f..4d942baedd4 100644
--- a/src/components/structures/EmbeddedPage.tsx
+++ b/src/components/structures/EmbeddedPage.tsx
@@ -24,11 +24,11 @@ import { logger } from "matrix-js-sdk/src/logger";
 import { _t, TranslationKey } from "../../languageHandler";
 import dis from "../../dispatcher/dispatcher";
 import { MatrixClientPeg } from "../../MatrixClientPeg";
-import MatrixClientContext from "../../contexts/MatrixClientContext";
+import { MatrixClientProps, withMatrixClientHOC } from "../../contexts/MatrixClientContext";
 import AutoHideScrollbar from "./AutoHideScrollbar";
 import { ActionPayload } from "../../dispatcher/payloads";
 
-interface IProps {
+interface IProps extends MatrixClientProps {
     // URL to request embedded page content from
     url?: string;
     // Class name prefix to apply for a given instance
@@ -43,13 +43,12 @@ interface IState {
     page: string;
 }
 
-export default class EmbeddedPage extends React.PureComponent<IProps, IState> {
-    public static contextType = MatrixClientContext;
+class EmbeddedPage extends React.PureComponent<IProps, IState> {
     private unmounted = false;
     private dispatcherRef: string | null = null;
 
-    public constructor(props: IProps, context: typeof MatrixClientContext) {
-        super(props, context);
+    public constructor(props: IProps) {
+        super(props);
 
         this.state = {
             page: "",
@@ -120,7 +119,7 @@ export default class EmbeddedPage extends React.PureComponent<IProps, IState> {
 
     public render(): React.ReactNode {
         // HACK: Workaround for the context's MatrixClient not updating.
-        const client = this.context || MatrixClientPeg.get();
+        const client = this.props.mxClient || MatrixClientPeg.get();
         const isGuest = client ? client.isGuest() : true;
         const className = this.props.className;
         const classes = classnames(className, {
@@ -137,3 +136,5 @@ export default class EmbeddedPage extends React.PureComponent<IProps, IState> {
         }
     }
 }
+
+export default withMatrixClientHOC(EmbeddedPage);
diff --git a/src/components/structures/FilePanel.tsx b/src/components/structures/FilePanel.tsx
index 38368634315..a1d4808b022 100644
--- a/src/components/structures/FilePanel.tsx
+++ b/src/components/structures/FilePanel.tsx
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, { createRef } from "react";
+import React, { createRef, forwardRef } from "react";
 import {
     Filter,
     EventTimelineSet,
@@ -45,6 +45,7 @@ interface IProps {
     roomId: string;
     onClose: () => void;
     resizeNotifier: ResizeNotifier;
+    context: React.ContextType<typeof RoomContext>;
 }
 
 interface IState {
@@ -56,8 +57,6 @@ interface IState {
  * Component which shows the filtered file using a TimelinePanel
  */
 class FilePanel extends React.Component<IProps, IState> {
-    public static contextType = RoomContext;
-
     // This is used to track if a decrypted event was a live event and should be
     // added to the timeline.
     private decryptingEvents = new Set<string>();
@@ -267,7 +266,7 @@ class FilePanel extends React.Component<IProps, IState> {
             return (
                 <RoomContext.Provider
                     value={{
-                        ...this.context,
+                        ...this.props.context,
                         timelineRenderingType: TimelineRenderingType.File,
                         narrow: this.state.narrow,
                     }}
@@ -299,7 +298,7 @@ class FilePanel extends React.Component<IProps, IState> {
             return (
                 <RoomContext.Provider
                     value={{
-                        ...this.context,
+                        ...this.props.context,
                         timelineRenderingType: TimelineRenderingType.File,
                     }}
                 >
@@ -312,4 +311,6 @@ class FilePanel extends React.Component<IProps, IState> {
     }
 }
 
-export default FilePanel;
+export default forwardRef<FilePanel, Omit<IProps, "context">>((props, ref) => (
+    <RoomContext.Consumer>{(context) => <FilePanel {...props} context={context} ref={ref} />}</RoomContext.Consumer>
+));
diff --git a/src/components/structures/LoggedInView.tsx b/src/components/structures/LoggedInView.tsx
index 4481e4f6038..d6bbcb08c62 100644
--- a/src/components/structures/LoggedInView.tsx
+++ b/src/components/structures/LoggedInView.tsx
@@ -58,7 +58,6 @@ import AudioFeedArrayForLegacyCall from "../views/voip/AudioFeedArrayForLegacyCa
 import { OwnProfileStore } from "../../stores/OwnProfileStore";
 import { UPDATE_EVENT } from "../../stores/AsyncStore";
 import RoomView from "./RoomView";
-import type { RoomView as RoomViewType } from "./RoomView";
 import ToastContainer from "./ToastContainer";
 import UserView from "./UserView";
 import BackdropPanel from "./BackdropPanel";
@@ -132,7 +131,7 @@ class LoggedInView extends React.Component<IProps, IState> {
     public static displayName = "LoggedInView";
 
     protected readonly _matrixClient: MatrixClient;
-    protected readonly _roomView: React.RefObject<RoomViewType>;
+    protected readonly _roomView: React.RefObject<React.ComponentRef<typeof RoomView>>;
     protected readonly _resizeContainer: React.RefObject<HTMLDivElement>;
     protected readonly resizeHandler: React.RefObject<HTMLDivElement>;
     protected layoutWatcherRef?: string;
diff --git a/src/components/structures/MessagePanel.tsx b/src/components/structures/MessagePanel.tsx
index 3a97f27b381..121577855c4 100644
--- a/src/components/structures/MessagePanel.tsx
+++ b/src/components/structures/MessagePanel.tsx
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, { createRef, ReactNode, TransitionEvent } from "react";
+import React, { createRef, forwardRef, ReactNode, TransitionEvent } from "react";
 import ReactDOM from "react-dom";
 import classNames from "classnames";
 import { Room, MatrixClient, RoomStateEvent, EventStatus, MatrixEvent, EventType } from "matrix-js-sdk/src/matrix";
@@ -31,7 +31,6 @@ import EventTile, {
     GetRelationsForEvent,
     IReadReceiptProps,
     isEligibleForSpecialReceipt,
-    UnwrappedEventTile,
 } from "../views/rooms/EventTile";
 import IRCTimelineProfileResizer from "../views/elements/IRCTimelineProfileResizer";
 import defaultDispatcher from "../../dispatcher/dispatcher";
@@ -188,6 +187,7 @@ interface IProps {
     disableGrouping?: boolean;
 
     callEventGroupers: Map<string, LegacyCallEventGrouper>;
+    context: React.ContextType<typeof RoomContext>;
 }
 
 interface IState {
@@ -203,10 +203,7 @@ interface IReadReceiptForUser {
 
 /* (almost) stateless UI component which builds the event tiles in the room timeline.
  */
-export default class MessagePanel extends React.Component<IProps, IState> {
-    public static contextType = RoomContext;
-    public context!: React.ContextType<typeof RoomContext>;
-
+class MessagePanel extends React.Component<IProps, IState> {
     public static defaultProps = {
         disableGrouping: false,
     };
@@ -256,13 +253,13 @@ export default class MessagePanel extends React.Component<IProps, IState> {
     private scrollPanel = createRef<ScrollPanel>();
 
     private readonly showTypingNotificationsWatcherRef: string;
-    private eventTiles: Record<string, UnwrappedEventTile> = {};
+    private eventTiles: Record<string, React.ComponentRef<typeof EventTile>> = {};
 
     // A map to allow groupers to maintain consistent keys even if their first event is uprooted due to back-pagination.
     public grouperKeyMap = new WeakMap<MatrixEvent, string>();
 
-    public constructor(props: IProps, context: React.ContextType<typeof RoomContext>) {
-        super(props, context);
+    public constructor(props: IProps) {
+        super(props);
 
         this.state = {
             // previous positions the read marker has been in, so we can
@@ -320,7 +317,7 @@ export default class MessagePanel extends React.Component<IProps, IState> {
             defaultDispatcher.dispatch({
                 action: Action.EditEvent,
                 event: !event?.isRedacted() ? event : null,
-                timelineRenderingType: this.context.timelineRenderingType,
+                timelineRenderingType: this.props.context.timelineRenderingType,
             });
         }
     }
@@ -354,7 +351,7 @@ export default class MessagePanel extends React.Component<IProps, IState> {
         return this.eventTiles[eventId]?.ref?.current ?? undefined;
     }
 
-    public getTileForEventId(eventId?: string): UnwrappedEventTile | undefined {
+    public getTileForEventId(eventId?: string): React.ComponentRef<typeof EventTile> | undefined {
         if (!this.eventTiles || !eventId) {
             return undefined;
         }
@@ -454,7 +451,7 @@ export default class MessagePanel extends React.Component<IProps, IState> {
     };
 
     public get showHiddenEvents(): boolean {
-        return this.context?.showHiddenEvents ?? this._showHiddenEvents;
+        return this.props.context?.showHiddenEvents ?? this._showHiddenEvents;
     }
 
     // TODO: Implement granular (per-room) hide options
@@ -481,7 +478,7 @@ export default class MessagePanel extends React.Component<IProps, IState> {
         // Always show highlighted event
         if (this.props.highlightedEventId === mxEv.getId()) return true;
 
-        return !shouldHideEvent(mxEv, this.context);
+        return !shouldHideEvent(mxEv, this.props.context);
     }
 
     public readMarkerForEvent(eventId: string, isLastEvent: boolean): ReactNode {
@@ -592,7 +589,9 @@ export default class MessagePanel extends React.Component<IProps, IState> {
         }
 
         try {
-            return localStorage.getItem(editorRoomKey(this.props.room.roomId, this.context.timelineRenderingType));
+            return localStorage.getItem(
+                editorRoomKey(this.props.room.roomId, this.props.context.timelineRenderingType),
+            );
         } catch (err) {
             logger.error(err);
             return null;
@@ -775,13 +774,25 @@ export default class MessagePanel extends React.Component<IProps, IState> {
                 willWantSeparator === SeparatorKind.Date ||
                 mxEv.getSender() !== nextEv.getSender() ||
                 getEventDisplayInfo(cli, nextEv, this.showHiddenEvents).isInfoMessage ||
-                !shouldFormContinuation(mxEv, nextEv, cli, this.showHiddenEvents, this.context.timelineRenderingType);
+                !shouldFormContinuation(
+                    mxEv,
+                    nextEv,
+                    cli,
+                    this.showHiddenEvents,
+                    this.props.context.timelineRenderingType,
+                );
         }
 
         // is this a continuation of the previous message?
         const continuation =
             wantsSeparator === SeparatorKind.None &&
-            shouldFormContinuation(prevEvent, mxEv, cli, this.showHiddenEvents, this.context.timelineRenderingType);
+            shouldFormContinuation(
+                prevEvent,
+                mxEv,
+                cli,
+                this.showHiddenEvents,
+                this.props.context.timelineRenderingType,
+            );
 
         const eventId = mxEv.getId()!;
         const highlight = eventId === this.props.highlightedEventId;
@@ -826,7 +837,7 @@ export default class MessagePanel extends React.Component<IProps, IState> {
     }
 
     public wantsSeparator(prevEvent: MatrixEvent | null, mxEvent: MatrixEvent): SeparatorKind {
-        if (this.context.timelineRenderingType === TimelineRenderingType.ThreadsList) {
+        if (this.props.context.timelineRenderingType === TimelineRenderingType.ThreadsList) {
             return SeparatorKind.None;
         }
 
@@ -863,13 +874,13 @@ export default class MessagePanel extends React.Component<IProps, IState> {
             return null;
         }
 
-        const receiptDestination = this.context.threadId ? room.getThread(this.context.threadId) : room;
+        const receiptDestination = this.props.context.threadId ? room.getThread(this.props.context.threadId) : room;
 
         const receipts: IReadReceiptProps[] = [];
 
         if (!receiptDestination) {
             logger.debug(
-                "Discarding request, could not find the receiptDestination for event: " + this.context.threadId,
+                "Discarding request, could not find the receiptDestination for event: " + this.props.context.threadId,
             );
             return receipts;
         }
@@ -950,7 +961,7 @@ export default class MessagePanel extends React.Component<IProps, IState> {
         return receiptsByEvent;
     }
 
-    private collectEventTile = (eventId: string, node: UnwrappedEventTile): void => {
+    private collectEventTile = (eventId: string, node: React.ComponentRef<typeof EventTile>): void => {
         this.eventTiles[eventId] = node;
     };
 
@@ -1033,7 +1044,7 @@ export default class MessagePanel extends React.Component<IProps, IState> {
         if (
             this.props.room &&
             this.state.showTypingNotifications &&
-            this.context.timelineRenderingType === TimelineRenderingType.Room
+            this.props.context.timelineRenderingType === TimelineRenderingType.Room
         ) {
             whoIsTyping = (
                 <WhoIsTypingTile
@@ -1053,7 +1064,7 @@ export default class MessagePanel extends React.Component<IProps, IState> {
         }
 
         const classes = classNames(this.props.className, {
-            mx_MessagePanel_narrow: this.context.narrow,
+            mx_MessagePanel_narrow: this.props.context.narrow,
         });
 
         return (
@@ -1079,10 +1090,14 @@ export default class MessagePanel extends React.Component<IProps, IState> {
     }
 }
 
+export default forwardRef<MessagePanel, Omit<IProps, "context">>((props, ref) => (
+    <RoomContext.Consumer>{(context) => <MessagePanel {...props} context={context} ref={ref} />}</RoomContext.Consumer>
+));
+
 /**
- * Holds on to an event, caching the information about it in the context of the current messages list.
+ * Holds on to an event, caching the information about it in the props.context. of the current messages list.
  * Avoids calling shouldShowEvent more times than we need to.
- * Simplifies threading of event context like whether it's the last successful event we sent which cannot be determined
+ * Simplifies threading of event props.context. like whether it's the last successful event we sent which cannot be determined
  * by a consumer from the event alone, so has to be done by the event list processing code earlier.
  */
 export interface WrappedEvent {
diff --git a/src/components/structures/NotificationPanel.tsx b/src/components/structures/NotificationPanel.tsx
index 0da27a19b10..082e01d9f98 100644
--- a/src/components/structures/NotificationPanel.tsx
+++ b/src/components/structures/NotificationPanel.tsx
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from "react";
+import React, { forwardRef } from "react";
 import { logger } from "matrix-js-sdk/src/logger";
 
 import { _t } from "../../languageHandler";
@@ -29,6 +29,7 @@ import Heading from "../views/typography/Heading";
 
 interface IProps {
     onClose(): void;
+    context: React.ContextType<typeof RoomContext>;
 }
 
 interface IState {
@@ -38,9 +39,7 @@ interface IState {
 /*
  * Component which shows the global notification list using a TimelinePanel
  */
-export default class NotificationPanel extends React.PureComponent<IProps, IState> {
-    public static contextType = RoomContext;
-
+class NotificationPanel extends React.PureComponent<IProps, IState> {
     private card = React.createRef<HTMLDivElement>();
 
     public constructor(props: IProps) {
@@ -86,7 +85,7 @@ export default class NotificationPanel extends React.PureComponent<IProps, IStat
         return (
             <RoomContext.Provider
                 value={{
-                    ...this.context,
+                    ...this.props.context,
                     timelineRenderingType: TimelineRenderingType.Notification,
                     narrow: this.state.narrow,
                 }}
@@ -114,3 +113,9 @@ export default class NotificationPanel extends React.PureComponent<IProps, IStat
         );
     }
 }
+
+export default forwardRef<NotificationPanel, Omit<IProps, "context">>((props, ref) => (
+    <RoomContext.Consumer>
+        {(context) => <NotificationPanel {...props} context={context} ref={ref} />}
+    </RoomContext.Consumer>
+));
diff --git a/src/components/structures/RightPanel.tsx b/src/components/structures/RightPanel.tsx
index 68d600ec1de..1d80b388c3c 100644
--- a/src/components/structures/RightPanel.tsx
+++ b/src/components/structures/RightPanel.tsx
@@ -22,7 +22,7 @@ import { throttle } from "lodash";
 import dis from "../../dispatcher/dispatcher";
 import { RightPanelPhases } from "../../stores/right-panel/RightPanelStorePhases";
 import RightPanelStore from "../../stores/right-panel/RightPanelStore";
-import MatrixClientContext from "../../contexts/MatrixClientContext";
+import { MatrixClientProps, withMatrixClientHOC } from "../../contexts/MatrixClientContext";
 import RoomSummaryCard from "../views/right_panel/RoomSummaryCard";
 import WidgetCard from "../views/right_panel/WidgetCard";
 import SettingsStore from "../../settings/SettingsStore";
@@ -43,7 +43,7 @@ import { IRightPanelCard, IRightPanelCardState } from "../../stores/right-panel/
 import { Action } from "../../dispatcher/actions";
 import { XOR } from "../../@types/common";
 
-interface BaseProps {
+interface BaseProps extends MatrixClientProps {
     overwriteCard?: IRightPanelCard; // used to display a custom card and ignoring the RightPanelStore (used for UserView)
     resizeNotifier: ResizeNotifier;
     e2eStatus?: E2EStatus;
@@ -68,12 +68,9 @@ interface IState {
     cardState?: IRightPanelCardState;
 }
 
-export default class RightPanel extends React.Component<Props, IState> {
-    public static contextType = MatrixClientContext;
-    public context!: React.ContextType<typeof MatrixClientContext>;
-
-    public constructor(props: Props, context: React.ContextType<typeof MatrixClientContext>) {
-        super(props, context);
+class RightPanel extends React.Component<Props, IState> {
+    public constructor(props: Props) {
+        super(props);
 
         this.state = {
             searchQuery: "",
@@ -89,12 +86,12 @@ export default class RightPanel extends React.Component<Props, IState> {
     );
 
     public componentDidMount(): void {
-        this.context.on(RoomStateEvent.Members, this.onRoomStateMember);
+        this.props.mxClient.on(RoomStateEvent.Members, this.onRoomStateMember);
         RightPanelStore.instance.on(UPDATE_EVENT, this.onRightPanelStoreUpdate);
     }
 
     public componentWillUnmount(): void {
-        this.context?.removeListener(RoomStateEvent.Members, this.onRoomStateMember);
+        this.props.mxClient?.removeListener(RoomStateEvent.Members, this.onRoomStateMember);
         RightPanelStore.instance.off(UPDATE_EVENT, this.onRightPanelStoreUpdate);
     }
 
@@ -199,7 +196,7 @@ export default class RightPanel extends React.Component<Props, IState> {
                     card = (
                         <UserInfo
                             user={cardState.member}
-                            room={this.context.getRoom(roomMember?.roomId) ?? this.props.room}
+                            room={this.props.mxClient.getRoom(roomMember?.roomId) ?? this.props.room}
                             key={roomId ?? cardState.member.userId}
                             onClose={this.onClose}
                             phase={phase}
@@ -316,3 +313,5 @@ export default class RightPanel extends React.Component<Props, IState> {
         );
     }
 }
+
+export default withMatrixClientHOC(RightPanel);
diff --git a/src/components/structures/RoomStatusBar.tsx b/src/components/structures/RoomStatusBar.tsx
index 311f6b89b55..7e7586b0ac6 100644
--- a/src/components/structures/RoomStatusBar.tsx
+++ b/src/components/structures/RoomStatusBar.tsx
@@ -15,7 +15,16 @@ limitations under the License.
 */
 
 import React, { ReactNode } from "react";
-import { EventStatus, MatrixEvent, Room, MatrixError, SyncState, SyncStateData } from "matrix-js-sdk/src/matrix";
+import {
+    EventStatus,
+    MatrixEvent,
+    Room,
+    MatrixError,
+    SyncState,
+    SyncStateData,
+    ClientEvent,
+    RoomEvent,
+} from "matrix-js-sdk/src/matrix";
 
 import { Icon as WarningIcon } from "../../../res/img/feather-customised/warning-triangle.svg";
 import { _t, _td } from "../../languageHandler";
@@ -26,7 +35,7 @@ import { Action } from "../../dispatcher/actions";
 import { StaticNotificationState } from "../../stores/notifications/StaticNotificationState";
 import AccessibleButton from "../views/elements/AccessibleButton";
 import InlineSpinner from "../views/elements/InlineSpinner";
-import MatrixClientContext from "../../contexts/MatrixClientContext";
+import { MatrixClientProps, withMatrixClientHOC } from "../../contexts/MatrixClientContext";
 import { RoomStatusBarUnsentMessages } from "./RoomStatusBarUnsentMessages";
 import ExternalLink from "../views/elements/ExternalLink";
 
@@ -45,7 +54,7 @@ export function getUnsentMessages(room: Room, threadId?: string): MatrixEvent[]
     });
 }
 
-interface IProps {
+interface IProps extends MatrixClientProps {
     // the room this statusbar is representing.
     room: Room;
 
@@ -79,31 +88,30 @@ interface IProps {
 }
 
 interface IState {
-    syncState: SyncState;
-    syncStateData: SyncStateData;
+    syncState: SyncState | null;
+    syncStateData: SyncStateData | null;
     unsentMessages: MatrixEvent[];
     isResending: boolean;
 }
 
-export default class RoomStatusBar extends React.PureComponent<IProps, IState> {
+class RoomStatusBar extends React.PureComponent<IProps, IState> {
     private unmounted = false;
-    public static contextType = MatrixClientContext;
 
-    public constructor(props: IProps, context: typeof MatrixClientContext) {
-        super(props, context);
+    public constructor(props: IProps) {
+        super(props);
 
         this.state = {
-            syncState: this.context.getSyncState(),
-            syncStateData: this.context.getSyncStateData(),
+            syncState: this.props.mxClient.getSyncState(),
+            syncStateData: this.props.mxClient.getSyncStateData(),
             unsentMessages: getUnsentMessages(this.props.room),
             isResending: false,
         };
     }
 
     public componentDidMount(): void {
-        const client = this.context;
-        client.on("sync", this.onSyncStateChange);
-        client.on("Room.localEchoUpdated", this.onRoomLocalEchoUpdated);
+        const client = this.props.mxClient;
+        client.on(ClientEvent.Sync, this.onSyncStateChange);
+        client.on(RoomEvent.LocalEchoUpdated, this.onRoomLocalEchoUpdated);
 
         this.checkSize();
     }
@@ -115,21 +123,21 @@ export default class RoomStatusBar extends React.PureComponent<IProps, IState> {
     public componentWillUnmount(): void {
         this.unmounted = true;
         // we may have entirely lost our client as we're logging out before clicking login on the guest bar...
-        const client = this.context;
+        const client = this.props.mxClient;
         if (client) {
-            client.removeListener("sync", this.onSyncStateChange);
-            client.removeListener("Room.localEchoUpdated", this.onRoomLocalEchoUpdated);
+            client.removeListener(ClientEvent.Sync, this.onSyncStateChange);
+            client.removeListener(RoomEvent.LocalEchoUpdated, this.onRoomLocalEchoUpdated);
         }
     }
 
-    private onSyncStateChange = (state: SyncState, prevState: SyncState, data: SyncStateData): void => {
+    private onSyncStateChange = (state: SyncState, prevState: SyncState | null, data?: SyncStateData): void => {
         if (state === "SYNCING" && prevState === "SYNCING") {
             return;
         }
         if (this.unmounted) return;
         this.setState({
             syncState: state,
-            syncStateData: data,
+            syncStateData: data ?? null,
         });
     };
 
@@ -289,3 +297,5 @@ export default class RoomStatusBar extends React.PureComponent<IProps, IState> {
         return null;
     }
 }
+
+export default withMatrixClientHOC(RoomStatusBar);
diff --git a/src/components/structures/RoomView.tsx b/src/components/structures/RoomView.tsx
index a15ddbf7742..1e171162ed1 100644
--- a/src/components/structures/RoomView.tsx
+++ b/src/components/structures/RoomView.tsx
@@ -17,7 +17,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, { createRef, ReactElement, ReactNode, RefObject, useContext } from "react";
+import React, { createRef, forwardRef, ReactElement, ReactNode, RefObject, useContext } from "react";
 import classNames from "classnames";
 import {
     IRecommendedVersion,
@@ -157,6 +157,7 @@ interface IRoomProps {
 
     // Called with the credentials of a registered user (if they were a ROU that transitioned to PWLU)
     onRegistered?(credentials: IMatrixClientCreds): void;
+    context: React.ContextType<typeof SDKContext>;
 }
 
 // This defines the content of the mainSplit.
@@ -322,7 +323,7 @@ function LocalRoomView(props: LocalRoomViewProps): ReactElement {
                     <RoomHeader room={room} />
                 ) : (
                     <LegacyRoomHeader
-                        room={context.room}
+                        room={context.room!}
                         searchInfo={undefined}
                         inRoom={true}
                         onSearchClick={null}
@@ -399,7 +400,7 @@ function LocalRoomCreateLoader(props: ILocalRoomCreateLoaderProps): ReactElement
     );
 }
 
-export class RoomView extends React.Component<IRoomProps, IRoomState> {
+class RoomView extends React.Component<IRoomProps, IRoomState> {
     private readonly askToJoinEnabled: boolean;
     private readonly dispatcherRef: string;
     private settingWatchers: string[];
@@ -409,22 +410,19 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
 
     private roomView = createRef<HTMLDivElement>();
     private searchResultsPanel = createRef<ScrollPanel>();
-    private messagePanel: TimelinePanel | null = null;
+    private messagePanel: React.ComponentRef<typeof TimelinePanel> | null = null;
     private roomViewBody = createRef<HTMLDivElement>();
 
-    public static contextType = SDKContext;
-    public context!: React.ContextType<typeof SDKContext>;
-
-    public constructor(props: IRoomProps, context: React.ContextType<typeof SDKContext>) {
-        super(props, context);
+    public constructor(props: IRoomProps) {
+        super(props);
 
         this.askToJoinEnabled = SettingsStore.getValue("feature_ask_to_join");
 
-        if (!context.client) {
+        if (!props.context.client) {
             throw new Error("Unable to create RoomView without MatrixClient");
         }
 
-        const llMembers = context.client.hasLazyLoadMembersEnabled();
+        const llMembers = props.context.client.hasLazyLoadMembersEnabled();
         this.state = {
             roomId: undefined,
             roomLoading: true,
@@ -458,7 +456,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
             showJoinLeaves: true,
             showAvatarChanges: true,
             showDisplaynameChanges: true,
-            matrixClientIsReady: context.client?.isInitialSyncComplete(),
+            matrixClientIsReady: props.context.client?.isInitialSyncComplete(),
             mainSplitContentType: MainSplitContentType.Timeline,
             timelineRenderingType: TimelineRenderingType.Room,
             liveTimeline: undefined,
@@ -470,25 +468,25 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
         };
 
         this.dispatcherRef = dis.register(this.onAction);
-        context.client.on(ClientEvent.Room, this.onRoom);
-        context.client.on(RoomEvent.Timeline, this.onRoomTimeline);
-        context.client.on(RoomEvent.TimelineReset, this.onRoomTimelineReset);
-        context.client.on(RoomEvent.Name, this.onRoomName);
-        context.client.on(RoomStateEvent.Events, this.onRoomStateEvents);
-        context.client.on(RoomStateEvent.Update, this.onRoomStateUpdate);
-        context.client.on(RoomEvent.MyMembership, this.onMyMembership);
-        context.client.on(CryptoEvent.KeyBackupStatus, this.onKeyBackupStatus);
-        context.client.on(CryptoEvent.DeviceVerificationChanged, this.onDeviceVerificationChanged);
-        context.client.on(CryptoEvent.UserTrustStatusChanged, this.onUserVerificationChanged);
-        context.client.on(CryptoEvent.KeysChanged, this.onCrossSigningKeysChanged);
-        context.client.on(MatrixEventEvent.Decrypted, this.onEventDecrypted);
+        props.context.client.on(ClientEvent.Room, this.onRoom);
+        props.context.client.on(RoomEvent.Timeline, this.onRoomTimeline);
+        props.context.client.on(RoomEvent.TimelineReset, this.onRoomTimelineReset);
+        props.context.client.on(RoomEvent.Name, this.onRoomName);
+        props.context.client.on(RoomStateEvent.Events, this.onRoomStateEvents);
+        props.context.client.on(RoomStateEvent.Update, this.onRoomStateUpdate);
+        props.context.client.on(RoomEvent.MyMembership, this.onMyMembership);
+        props.context.client.on(CryptoEvent.KeyBackupStatus, this.onKeyBackupStatus);
+        props.context.client.on(CryptoEvent.DeviceVerificationChanged, this.onDeviceVerificationChanged);
+        props.context.client.on(CryptoEvent.UserTrustStatusChanged, this.onUserVerificationChanged);
+        props.context.client.on(CryptoEvent.KeysChanged, this.onCrossSigningKeysChanged);
+        props.context.client.on(MatrixEventEvent.Decrypted, this.onEventDecrypted);
         // Start listening for RoomViewStore updates
-        context.roomViewStore.on(UPDATE_EVENT, this.onRoomViewStoreUpdate);
+        props.context.roomViewStore.on(UPDATE_EVENT, this.onRoomViewStoreUpdate);
 
-        context.rightPanelStore.on(UPDATE_EVENT, this.onRightPanelStoreUpdate);
+        props.context.rightPanelStore.on(UPDATE_EVENT, this.onRightPanelStoreUpdate);
 
         WidgetEchoStore.on(UPDATE_EVENT, this.onWidgetEchoStoreUpdate);
-        context.widgetStore.on(UPDATE_EVENT, this.onWidgetStoreUpdate);
+        props.context.widgetStore.on(UPDATE_EVENT, this.onWidgetStoreUpdate);
 
         CallStore.instance.on(CallStoreEvent.ActiveCalls, this.onActiveCalls);
 
@@ -545,9 +543,9 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
             action: "appsDrawer",
             show: true,
         });
-        if (this.context.widgetLayoutStore.hasMaximisedWidget(this.state.room)) {
+        if (this.props.context.widgetLayoutStore.hasMaximisedWidget(this.state.room)) {
             // Show chat in right panel when a widget is maximised
-            this.context.rightPanelStore.setCard({ phase: RightPanelPhases.Timeline });
+            this.props.context.rightPanelStore.setCard({ phase: RightPanelPhases.Timeline });
         }
         this.checkWidgets(this.state.room);
     };
@@ -559,15 +557,15 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
      * This solves the issue if some people decide to start a conference and click the call button at the same time.
      */
     private doMaybeRemoveOwnJitsiWidget(): void {
-        if (!this.state.roomId || !this.state.room || !this.context.client) return;
+        if (!this.state.roomId || !this.state.room || !this.props.context.client) return;
 
-        const apps = this.context.widgetStore.getApps(this.state.roomId);
+        const apps = this.props.context.widgetStore.getApps(this.state.roomId);
         const jitsiApps = apps.filter((app) => app.eventId && WidgetType.JITSI.matches(app.type));
 
         // less than two Jitsi widgets → nothing to do
         if (jitsiApps.length < 2) return;
 
-        const currentUserId = this.context.client.getSafeUserId();
+        const currentUserId = this.props.context.client.getSafeUserId();
         const createdByCurrentUser = jitsiApps.find((apps) => apps.creatorUserId === currentUserId);
 
         // no Jitsi widget from current user → nothing to do
@@ -598,13 +596,13 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
             createdByCurrentUserTs - lastCreatedByOtherTs < PREVENT_MULTIPLE_JITSI_WITHIN
         ) {
             // more than one Jitsi widget with the last one from the current user → remove it
-            WidgetUtils.setRoomWidget(this.context.client, this.state.roomId, createdByCurrentUser.id);
+            WidgetUtils.setRoomWidget(this.props.context.client, this.state.roomId, createdByCurrentUser.id);
         }
     }
 
     private checkWidgets = (room: Room): void => {
         this.setState({
-            hasPinnedWidgets: this.context.widgetLayoutStore.hasPinnedWidgets(room),
+            hasPinnedWidgets: this.props.context.widgetLayoutStore.hasPinnedWidgets(room),
             mainSplitContentType: this.getMainSplitContentType(room),
             showApps: this.shouldShowApps(room),
         });
@@ -612,12 +610,12 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
 
     private getMainSplitContentType = (room: Room): MainSplitContentType => {
         if (
-            (SettingsStore.getValue("feature_group_calls") && this.context.roomViewStore.isViewingCall()) ||
+            (SettingsStore.getValue("feature_group_calls") && this.props.context.roomViewStore.isViewingCall()) ||
             isVideoRoom(room)
         ) {
             return MainSplitContentType.Call;
         }
-        if (this.context.widgetLayoutStore.hasMaximisedWidget(room)) {
+        if (this.props.context.widgetLayoutStore.hasMaximisedWidget(room)) {
             return MainSplitContentType.MaximisedWidget;
         }
         return MainSplitContentType.Timeline;
@@ -628,8 +626,8 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
             return;
         }
 
-        const roomLoadError = this.context.roomViewStore.getRoomLoadError() ?? undefined;
-        if (!initial && !roomLoadError && this.state.roomId !== this.context.roomViewStore.getRoomId()) {
+        const roomLoadError = this.props.context.roomViewStore.getRoomLoadError() ?? undefined;
+        if (!initial && !roomLoadError && this.state.roomId !== this.props.context.roomViewStore.getRoomId()) {
             // RoomView explicitly does not support changing what room
             // is being viewed: instead it should just be re-mounted when
             // switching rooms. Therefore, if the room ID changes, we
@@ -644,51 +642,51 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
             return;
         }
 
-        const roomId = this.context.roomViewStore.getRoomId() ?? null;
-        const room = this.context.client?.getRoom(roomId ?? undefined) ?? undefined;
+        const roomId = this.props.context.roomViewStore.getRoomId() ?? null;
+        const room = this.props.context.client?.getRoom(roomId ?? undefined) ?? undefined;
 
         const newState: Partial<IRoomState> = {
             roomId: roomId ?? undefined,
-            roomAlias: this.context.roomViewStore.getRoomAlias() ?? undefined,
-            roomLoading: this.context.roomViewStore.isRoomLoading(),
+            roomAlias: this.props.context.roomViewStore.getRoomAlias() ?? undefined,
+            roomLoading: this.props.context.roomViewStore.isRoomLoading(),
             roomLoadError,
-            joining: this.context.roomViewStore.isJoining(),
-            replyToEvent: this.context.roomViewStore.getQuotingEvent() ?? undefined,
+            joining: this.props.context.roomViewStore.isJoining(),
+            replyToEvent: this.props.context.roomViewStore.getQuotingEvent() ?? undefined,
             // we should only peek once we have a ready client
-            shouldPeek: this.state.matrixClientIsReady && this.context.roomViewStore.shouldPeek(),
+            shouldPeek: this.state.matrixClientIsReady && this.props.context.roomViewStore.shouldPeek(),
             showReadReceipts: SettingsStore.getValue("showReadReceipts", roomId),
             showRedactions: SettingsStore.getValue("showRedactions", roomId),
             showJoinLeaves: SettingsStore.getValue("showJoinLeaves", roomId),
             showAvatarChanges: SettingsStore.getValue("showAvatarChanges", roomId),
             showDisplaynameChanges: SettingsStore.getValue("showDisplaynameChanges", roomId),
-            wasContextSwitch: this.context.roomViewStore.getWasContextSwitch(),
+            wasContextSwitch: this.props.context.roomViewStore.getWasContextSwitch(),
             mainSplitContentType: room ? this.getMainSplitContentType(room) : undefined,
             initialEventId: undefined, // default to clearing this, will get set later in the method if needed
-            showRightPanel: roomId ? this.context.rightPanelStore.isOpenForRoom(roomId) : false,
+            showRightPanel: roomId ? this.props.context.rightPanelStore.isOpenForRoom(roomId) : false,
             threadRightPanel: roomId
                 ? [RightPanelPhases.ThreadView, RightPanelPhases.ThreadPanel].includes(
-                      this.context.rightPanelStore.currentCardForRoom(roomId).phase!,
+                      this.props.context.rightPanelStore.currentCardForRoom(roomId).phase!,
                   )
                 : false,
             activeCall: roomId ? CallStore.instance.getActiveCall(roomId) : null,
-            promptAskToJoin: this.context.roomViewStore.promptAskToJoin(),
-            viewRoomOpts: this.context.roomViewStore.getViewRoomOpts(),
+            promptAskToJoin: this.props.context.roomViewStore.promptAskToJoin(),
+            viewRoomOpts: this.props.context.roomViewStore.getViewRoomOpts(),
         };
 
         if (
             this.state.mainSplitContentType !== MainSplitContentType.Timeline &&
             newState.mainSplitContentType === MainSplitContentType.Timeline &&
-            this.context.rightPanelStore.isOpen &&
-            this.context.rightPanelStore.currentCard.phase === RightPanelPhases.Timeline &&
-            this.context.rightPanelStore.roomPhaseHistory.some((card) => card.phase === RightPanelPhases.Timeline)
+            this.props.context.rightPanelStore.isOpen &&
+            this.props.context.rightPanelStore.currentCard.phase === RightPanelPhases.Timeline &&
+            this.props.context.rightPanelStore.roomPhaseHistory.some((card) => card.phase === RightPanelPhases.Timeline)
         ) {
             // We're returning to the main timeline, so hide the right panel timeline
-            this.context.rightPanelStore.setCard({ phase: RightPanelPhases.RoomSummary });
-            this.context.rightPanelStore.togglePanel(this.state.roomId ?? null);
+            this.props.context.rightPanelStore.setCard({ phase: RightPanelPhases.RoomSummary });
+            this.props.context.rightPanelStore.togglePanel(this.state.roomId ?? null);
             newState.showRightPanel = false;
         }
 
-        const initialEventId = this.context.roomViewStore.getInitialEventId() ?? this.state.initialEventId;
+        const initialEventId = this.props.context.roomViewStore.getInitialEventId() ?? this.state.initialEventId;
         if (initialEventId) {
             let initialEvent = room?.findEventById(initialEventId);
             // The event does not exist in the current sync data
@@ -699,8 +697,9 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
             // and the root event.
             // The rest will be lost for now, until the aggregation API on the server
             // becomes available to fetch a whole thread
-            if (!initialEvent && this.context.client && roomId) {
-                initialEvent = (await fetchInitialEvent(this.context.client, roomId, initialEventId)) ?? undefined;
+            if (!initialEvent && this.props.context.client && roomId) {
+                initialEvent =
+                    (await fetchInitialEvent(this.props.context.client, roomId, initialEventId)) ?? undefined;
             }
 
             // If we have an initial event, we want to reset the event pixel offset to ensure it ends up visible
@@ -714,13 +713,13 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
                     action: Action.ShowThread,
                     rootEvent: thread.rootEvent,
                     initialEvent,
-                    highlighted: this.context.roomViewStore.isInitialEventHighlighted(),
-                    scroll_into_view: this.context.roomViewStore.initialEventScrollIntoView(),
+                    highlighted: this.props.context.roomViewStore.isInitialEventHighlighted(),
+                    scroll_into_view: this.props.context.roomViewStore.initialEventScrollIntoView(),
                 });
             } else {
                 newState.initialEventId = initialEventId;
-                newState.isInitialEventHighlighted = this.context.roomViewStore.isInitialEventHighlighted();
-                newState.initialEventScrollIntoView = this.context.roomViewStore.initialEventScrollIntoView();
+                newState.isInitialEventHighlighted = this.props.context.roomViewStore.isInitialEventHighlighted();
+                newState.initialEventScrollIntoView = this.props.context.roomViewStore.initialEventScrollIntoView();
             }
         }
 
@@ -745,7 +744,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
 
         if (!initial && this.state.shouldPeek && !newState.shouldPeek) {
             // Stop peeking because we have joined this room now
-            this.context.client?.stopPeeking();
+            this.props.context.client?.stopPeeking();
         }
 
         // Temporary logging to diagnose https://github.com/vector-im/element-web/issues/4307
@@ -766,7 +765,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
         // NB: This does assume that the roomID will not change for the lifetime of
         // the RoomView instance
         if (initial) {
-            newState.room = this.context.client!.getRoom(newState.roomId) || undefined;
+            newState.room = this.props.context.client!.getRoom(newState.roomId) || undefined;
             if (newState.room) {
                 newState.showApps = this.shouldShowApps(newState.room);
                 this.onRoomLoaded(newState.room);
@@ -897,7 +896,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
                     peekLoading: true,
                     isPeeking: true, // this will change to false if peeking fails
                 });
-                this.context.client
+                this.props.context.client
                     ?.peekInRoom(roomId)
                     .then((room) => {
                         if (this.unmounted) {
@@ -934,7 +933,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
                     });
             } else if (room) {
                 // Stop peeking because we have joined this room previously
-                this.context.client?.stopPeeking();
+                this.props.context.client?.stopPeeking();
                 this.setState({
                     isPeeking: false,
                     canAskToJoin: this.askToJoinEnabled && room.getJoinRule() === JoinRule.Knock,
@@ -955,7 +954,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
         // Otherwise (in case the user set hideWidgetDrawer by clicking the button) follow the parameter.
         const isManuallyShown = hideWidgetDrawer ? hideWidgetDrawer === "false" : true;
 
-        const widgets = this.context.widgetLayoutStore.getContainerWidgets(room, Container.Top);
+        const widgets = this.props.context.widgetLayoutStore.getContainerWidgets(room, Container.Top);
         return isManuallyShown && widgets.length > 0;
     }
 
@@ -968,7 +967,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
             callState,
         });
 
-        this.context.legacyCallHandler.on(LegacyCallHandlerEvent.CallState, this.onCallState);
+        this.props.context.legacyCallHandler.on(LegacyCallHandlerEvent.CallState, this.onCallState);
         window.addEventListener("beforeunload", this.onPageUnload);
     }
 
@@ -1005,7 +1004,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
         // (We could use isMounted, but facebook have deprecated that.)
         this.unmounted = true;
 
-        this.context.legacyCallHandler.removeListener(LegacyCallHandlerEvent.CallState, this.onCallState);
+        this.props.context.legacyCallHandler.removeListener(LegacyCallHandlerEvent.CallState, this.onCallState);
 
         // update the scroll map before we get unmounted
         if (this.state.roomId) {
@@ -1013,47 +1012,53 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
         }
 
         if (this.state.shouldPeek) {
-            this.context.client?.stopPeeking();
+            this.props.context.client?.stopPeeking();
         }
 
         // stop tracking room changes to format permalinks
         this.stopAllPermalinkCreators();
 
         dis.unregister(this.dispatcherRef);
-        if (this.context.client) {
-            this.context.client.removeListener(ClientEvent.Room, this.onRoom);
-            this.context.client.removeListener(RoomEvent.Timeline, this.onRoomTimeline);
-            this.context.client.removeListener(RoomEvent.TimelineReset, this.onRoomTimelineReset);
-            this.context.client.removeListener(RoomEvent.Name, this.onRoomName);
-            this.context.client.removeListener(RoomStateEvent.Events, this.onRoomStateEvents);
-            this.context.client.removeListener(RoomEvent.MyMembership, this.onMyMembership);
-            this.context.client.removeListener(RoomStateEvent.Update, this.onRoomStateUpdate);
-            this.context.client.removeListener(CryptoEvent.KeyBackupStatus, this.onKeyBackupStatus);
-            this.context.client.removeListener(CryptoEvent.DeviceVerificationChanged, this.onDeviceVerificationChanged);
-            this.context.client.removeListener(CryptoEvent.UserTrustStatusChanged, this.onUserVerificationChanged);
-            this.context.client.removeListener(CryptoEvent.KeysChanged, this.onCrossSigningKeysChanged);
-            this.context.client.removeListener(MatrixEventEvent.Decrypted, this.onEventDecrypted);
+        if (this.props.context.client) {
+            this.props.context.client.removeListener(ClientEvent.Room, this.onRoom);
+            this.props.context.client.removeListener(RoomEvent.Timeline, this.onRoomTimeline);
+            this.props.context.client.removeListener(RoomEvent.TimelineReset, this.onRoomTimelineReset);
+            this.props.context.client.removeListener(RoomEvent.Name, this.onRoomName);
+            this.props.context.client.removeListener(RoomStateEvent.Events, this.onRoomStateEvents);
+            this.props.context.client.removeListener(RoomEvent.MyMembership, this.onMyMembership);
+            this.props.context.client.removeListener(RoomStateEvent.Update, this.onRoomStateUpdate);
+            this.props.context.client.removeListener(CryptoEvent.KeyBackupStatus, this.onKeyBackupStatus);
+            this.props.context.client.removeListener(
+                CryptoEvent.DeviceVerificationChanged,
+                this.onDeviceVerificationChanged,
+            );
+            this.props.context.client.removeListener(
+                CryptoEvent.UserTrustStatusChanged,
+                this.onUserVerificationChanged,
+            );
+            this.props.context.client.removeListener(CryptoEvent.KeysChanged, this.onCrossSigningKeysChanged);
+            this.props.context.client.removeListener(MatrixEventEvent.Decrypted, this.onEventDecrypted);
         }
 
         window.removeEventListener("beforeunload", this.onPageUnload);
 
-        this.context.roomViewStore.off(UPDATE_EVENT, this.onRoomViewStoreUpdate);
+        this.props.context.roomViewStore.off(UPDATE_EVENT, this.onRoomViewStoreUpdate);
 
-        this.context.rightPanelStore.off(UPDATE_EVENT, this.onRightPanelStoreUpdate);
+        this.props.context.rightPanelStore.off(UPDATE_EVENT, this.onRightPanelStoreUpdate);
         WidgetEchoStore.removeListener(UPDATE_EVENT, this.onWidgetEchoStoreUpdate);
-        this.context.widgetStore.removeListener(UPDATE_EVENT, this.onWidgetStoreUpdate);
+        this.props.context.widgetStore.removeListener(UPDATE_EVENT, this.onWidgetStoreUpdate);
 
         this.props.resizeNotifier.off("isResizing", this.onIsResizing);
 
         if (this.state.room) {
-            this.context.widgetLayoutStore.off(
+            this.props.context.widgetLayoutStore.off(
                 WidgetLayoutStore.emissionForRoom(this.state.room),
                 this.onWidgetLayoutChange,
             );
         }
 
         CallStore.instance.off(CallStoreEvent.ActiveCalls, this.onActiveCalls);
-        this.context.legacyCallHandler.off(LegacyCallHandlerEvent.CallState, this.onCallState);
+        this.props.context.legacyCallHandler.off(LegacyCallHandlerEvent.CallState, this.onCallState);
 
         // cancel any pending calls to the throttled updated
         this.updateRoomMembers.cancel();
@@ -1064,17 +1069,17 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
 
         if (this.viewsLocalRoom && this.state.room) {
             // clean up if this was a local room
-            this.context.client?.store.removeRoom(this.state.room.roomId);
+            this.props.context.client?.store.removeRoom(this.state.room.roomId);
         }
     }
 
     private onRightPanelStoreUpdate = (): void => {
         const { roomId } = this.state;
         this.setState({
-            showRightPanel: roomId ? this.context.rightPanelStore.isOpenForRoom(roomId) : false,
+            showRightPanel: roomId ? this.props.context.rightPanelStore.isOpenForRoom(roomId) : false,
             threadRightPanel: roomId
                 ? [RightPanelPhases.ThreadView, RightPanelPhases.ThreadPanel].includes(
-                      this.context.rightPanelStore.currentCardForRoom(roomId).phase!,
+                      this.props.context.rightPanelStore.currentCardForRoom(roomId).phase!,
                   )
                 : false,
         });
@@ -1131,7 +1136,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
     };
 
     private onAction = async (payload: ActionPayload): Promise<void> => {
-        if (!this.context.client) return;
+        if (!this.props.context.client) return;
         switch (payload.action) {
             case "message_sent":
                 this.checkDesktopNotifications();
@@ -1151,7 +1156,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
                         [payload.file],
                         roomId,
                         undefined,
-                        this.context.client,
+                        this.props.context.client,
                     );
                 }
 
@@ -1183,7 +1188,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
                 if (!this.state.matrixClientIsReady) {
                     this.setState(
                         {
-                            matrixClientIsReady: !!this.context.client?.isInitialSyncComplete(),
+                            matrixClientIsReady: !!this.props.context.client?.isInitialSyncComplete(),
                         },
                         () => {
                             // send another "initial" RVS update to trigger peeking if needed
@@ -1296,8 +1301,8 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
     };
 
     private onLocalRoomEvent(roomId: string): void {
-        if (!this.context.client || !this.state.room || roomId !== this.state.room.roomId) return;
-        createRoomFromLocalRoom(this.context.client, this.state.room as LocalRoom);
+        if (!this.props.context.client || !this.state.room || roomId !== this.state.room.roomId) return;
+        createRoomFromLocalRoom(this.props.context.client, this.state.room as LocalRoom);
     }
 
     private onRoomTimeline = (
@@ -1336,7 +1341,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
             this.handleEffects(ev);
         }
 
-        if (this.context.client && ev.getSender() !== this.context.client.getSafeUserId()) {
+        if (this.props.context.client && ev.getSender() !== this.props.context.client.getSafeUserId()) {
             // update unread count when scrolled up
             if (!this.state.search && this.state.atEndOfLiveTimeline) {
                 // no change
@@ -1357,7 +1362,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
 
     private handleEffects = (ev: MatrixEvent): void => {
         if (!this.state.room) return;
-        const notifState = this.context.roomNotificationStateStore.getRoomState(this.state.room);
+        const notifState = this.props.context.roomNotificationStateStore.getRoomState(this.state.room);
         if (!notifState.isUnread) return;
 
         CHAT_EFFECTS.forEach((effect) => {
@@ -1400,7 +1405,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
     private onRoomLoaded = (room: Room): void => {
         if (this.unmounted) return;
         // Attach a widget store listener only when we get a room
-        this.context.widgetLayoutStore.on(WidgetLayoutStore.emissionForRoom(room), this.onWidgetLayoutChange);
+        this.props.context.widgetLayoutStore.on(WidgetLayoutStore.emissionForRoom(room), this.onWidgetLayoutChange);
 
         this.calculatePeekRules(room);
         this.updatePreviewUrlVisibility(room);
@@ -1413,10 +1418,10 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
 
         if (
             this.getMainSplitContentType(room) !== MainSplitContentType.Timeline &&
-            this.context.roomNotificationStateStore.getRoomState(room).isUnread
+            this.props.context.roomNotificationStateStore.getRoomState(room).isUnread
         ) {
             // Automatically open the chat panel to make unread messages easier to discover
-            this.context.rightPanelStore.setCard({ phase: RightPanelPhases.Timeline }, true, room.roomId);
+            this.props.context.rightPanelStore.setCard({ phase: RightPanelPhases.Timeline }, true, room.roomId);
         }
 
         this.setState({
@@ -1446,7 +1451,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
 
     private async loadMembersIfJoined(room: Room): Promise<void> {
         // lazy load members if enabled
-        if (this.context.client?.hasLazyLoadMembersEnabled()) {
+        if (this.props.context.client?.hasLazyLoadMembersEnabled()) {
             if (room && room.getMyMembership() === KnownMembership.Join) {
                 try {
                     await room.loadMembersIfNeeded();
@@ -1472,7 +1477,9 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
 
     private updatePreviewUrlVisibility({ roomId }: Room): void {
         // URL Previews in E2EE rooms can be a privacy leak so use a different setting which is per-room explicit
-        const key = this.context.client?.isRoomEncrypted(roomId) ? "urlPreviewsEnabled_e2ee" : "urlPreviewsEnabled";
+        const key = this.props.context.client?.isRoomEncrypted(roomId)
+            ? "urlPreviewsEnabled_e2ee"
+            : "urlPreviewsEnabled";
         this.setState({
             showUrlPreview: SettingsStore.getValue(key, roomId),
         });
@@ -1485,7 +1492,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
 
         // Detach the listener if the room is changing for some reason
         if (this.state.room) {
-            this.context.widgetLayoutStore.off(
+            this.props.context.widgetLayoutStore.off(
                 WidgetLayoutStore.emissionForRoom(this.state.room),
                 this.onWidgetLayoutChange,
             );
@@ -1525,15 +1532,15 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
     };
 
     private async updateE2EStatus(room: Room): Promise<void> {
-        if (!this.context.client?.isRoomEncrypted(room.roomId)) return;
+        if (!this.props.context.client?.isRoomEncrypted(room.roomId)) return;
 
         // If crypto is not currently enabled, we aren't tracking devices at all,
         // so we don't know what the answer is. Let's error on the safe side and show
         // a warning for this case.
         let e2eStatus = E2EStatus.Warning;
-        if (this.context.client.isCryptoEnabled()) {
+        if (this.props.context.client.isCryptoEnabled()) {
             /* At this point, the user has encryption on and cross-signing on */
-            e2eStatus = await shieldStatusForRoom(this.context.client, room);
+            e2eStatus = await shieldStatusForRoom(this.props.context.client, room);
         }
 
         if (this.unmounted) return;
@@ -1578,8 +1585,8 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
     };
 
     private updatePermissions(room: Room): void {
-        if (room && this.context.client) {
-            const me = this.context.client.getSafeUserId();
+        if (room && this.props.context.client) {
+            const me = this.props.context.client.getSafeUserId();
             const canReact =
                 room.getMyMembership() === KnownMembership.Join &&
                 room.currentState.maySendEvent(EventType.Reaction, me);
@@ -1635,7 +1642,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
 
     private onJoinButtonClicked = (): void => {
         // If the user is a ROU, allow them to transition to a PWLU
-        if (this.context.client?.isGuest()) {
+        if (this.props.context.client?.isGuest()) {
             // Join this room once the user has registered and logged in
             // (If we failed to peek, we may not have a valid room object.)
             dis.dispatch<DoAfterSyncPreparedPayload<ViewRoomPayload>>({
@@ -1702,14 +1709,14 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
 
     private injectSticker(url: string, info: object, text: string, threadId: string | null): void {
         const roomId = this.getRoomId();
-        if (!this.context.client || !roomId) return;
-        if (this.context.client.isGuest()) {
+        if (!this.props.context.client || !roomId) return;
+        if (this.props.context.client.isGuest()) {
             dis.dispatch({ action: "require_registration" });
             return;
         }
 
         ContentMessages.sharedInstance()
-            .sendStickerContentToRoom(url, roomId, threadId, info, text, this.context.client)
+            .sendStickerContentToRoom(url, roomId, threadId, info, text, this.props.context.client)
             .then(undefined, (error) => {
                 if (error.name === "UnknownDeviceError") {
                     // Let the staus bar handle this
@@ -1722,7 +1729,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
         const roomId = scope === SearchScope.Room ? this.getRoomId() : undefined;
         debuglog("sending search request");
         const abortController = new AbortController();
-        const promise = eventSearch(this.context.client!, term, roomId, abortController.signal);
+        const promise = eventSearch(this.props.context.client!, term, roomId, abortController.signal);
 
         this.setState({
             search: {
@@ -1768,7 +1775,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
         this.setState({
             rejecting: true,
         });
-        this.context.client?.leave(roomId).then(
+        this.props.context.client?.leave(roomId).then(
             () => {
                 dis.dispatch({ action: Action.ViewHomePage });
                 this.setState({
@@ -1797,13 +1804,13 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
         });
 
         try {
-            const myMember = this.state.room!.getMember(this.context.client!.getSafeUserId());
+            const myMember = this.state.room!.getMember(this.props.context.client!.getSafeUserId());
             const inviteEvent = myMember!.events.member;
-            const ignoredUsers = this.context.client!.getIgnoredUsers();
+            const ignoredUsers = this.props.context.client!.getIgnoredUsers();
             ignoredUsers.push(inviteEvent!.getSender()!); // de-duped internally in the js-sdk
-            await this.context.client!.setIgnoredUsers(ignoredUsers);
+            await this.props.context.client!.setIgnoredUsers(ignoredUsers);
 
-            await this.context.client!.leave(this.state.roomId!);
+            await this.props.context.client!.leave(this.state.roomId!);
             dis.dispatch({ action: Action.ViewHomePage });
             this.setState({
                 rejecting: false,
@@ -1951,7 +1958,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
      * We pass it down to the scroll panel.
      */
     public handleScrollKey = (ev: React.KeyboardEvent | KeyboardEvent): void => {
-        let panel: ScrollPanel | TimelinePanel | undefined;
+        let panel: ScrollPanel | React.ComponentRef<typeof TimelinePanel> | undefined;
         if (this.searchResultsPanel.current) {
             panel = this.searchResultsPanel.current;
         } else if (this.messagePanel) {
@@ -1968,18 +1975,18 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
         if (!this.state.room) {
             return null;
         }
-        return this.context.legacyCallHandler.getCallForRoom(this.state.room.roomId);
+        return this.props.context.legacyCallHandler.getCallForRoom(this.state.room.roomId);
     }
 
     // this has to be a proper method rather than an unnamed function,
     // otherwise react calls it with null on each update.
-    private gatherTimelinePanelRef = (r: TimelinePanel | null): void => {
+    private gatherTimelinePanelRef = (r: React.ComponentRef<typeof TimelinePanel> | null): void => {
         this.messagePanel = r;
     };
 
     private getOldRoom(): Room | null {
         const { roomId } = this.state.room?.findPredecessor(this.state.msc3946ProcessDynamicPredecessor) || {};
-        return this.context.client?.getRoom(roomId) || null;
+        return this.props.context.client?.getRoom(roomId) || null;
     }
 
     public getHiddenHighlightCount(): number {
@@ -2006,12 +2013,12 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
 
     private onFileDrop = async (dataTransfer: DataTransfer): Promise<void> => {
         const roomId = this.getRoomId();
-        if (!roomId || !this.context.client) return;
+        if (!roomId || !this.props.context.client) return;
         await ContentMessages.sharedInstance().sendContentListToRoom(
             Array.from(dataTransfer.files),
             roomId,
             undefined,
-            this.context.client,
+            this.props.context.client,
             TimelineRenderingType.Room,
         );
     };
@@ -2029,8 +2036,8 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
     }
 
     private renderLocalRoomCreateLoader(localRoom: LocalRoom): ReactNode {
-        if (!this.state.room || !this.context?.client) return null;
-        const names = this.state.room.getDefaultRoomName(this.context.client.getSafeUserId());
+        if (!this.state.room || !this.props.context?.client) return null;
+        const names = this.state.room.getDefaultRoomName(this.props.context.client.getSafeUserId());
         return (
             <RoomContext.Provider value={this.state}>
                 <LocalRoomCreateLoader localRoom={localRoom} names={names} resizeNotifier={this.props.resizeNotifier} />
@@ -2099,7 +2106,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
     };
 
     public render(): ReactNode {
-        if (!this.context.client) return null;
+        if (!this.props.context.client) return null;
 
         if (this.state.room instanceof LocalRoom) {
             if (this.state.room.state === LocalRoomState.CREATING) {
@@ -2209,7 +2216,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
                     </ErrorBoundary>
                 );
             } else {
-                const myUserId = this.context.client.getSafeUserId();
+                const myUserId = this.props.context.client.getSafeUserId();
                 const myMember = this.state.room.getMember(myUserId);
                 const inviteEvent = myMember ? myMember.events.member : null;
                 let inviterName = _t("room|inviter_unknown");
@@ -2313,7 +2320,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
         const showRoomUpgradeBar =
             roomVersionRecommendation &&
             roomVersionRecommendation.needsUpgrade &&
-            this.state.room.userMayUpgradeRoom(this.context.client.getSafeUserId());
+            this.state.room.userMayUpgradeRoom(this.props.context.client.getSafeUserId());
 
         const hiddenHighlightCount = this.getHiddenHighlightCount();
 
@@ -2325,7 +2332,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
                     searchInProgress={this.state.search?.inProgress}
                     onCancelClick={this.onCancelSearchClick}
                     onSearch={this.onSearch}
-                    isRoomEncrypted={this.context.client.isRoomEncrypted(this.state.room.roomId)}
+                    isRoomEncrypted={this.props.context.client.isRoomEncrypted(this.state.room.roomId)}
                 />
             );
         } else if (showRoomUpgradeBar) {
@@ -2393,7 +2400,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
         const auxPanel = (
             <AuxPanel
                 room={this.state.room}
-                userId={this.context.client.getSafeUserId()}
+                userId={this.props.context.client.getSafeUserId()}
                 showApps={this.state.showApps}
                 resizeNotifier={this.props.resizeNotifier}
             >
@@ -2546,7 +2553,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
                     <>
                         <AppsDrawer
                             room={this.state.room}
-                            userId={this.context.client.getSafeUserId()}
+                            userId={this.props.context.client.getSafeUserId()}
                             resizeNotifier={this.props.resizeNotifier}
                             showApps={true}
                             role="main"
@@ -2563,7 +2570,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
                             room={this.state.room}
                             resizing={this.state.resizing}
                             waitForCall={isVideoRoom(this.state.room)}
-                            skipLobby={this.context.roomViewStore.skipCallLobby() ?? false}
+                            skipLobby={this.props.context.roomViewStore.skipCallLobby() ?? false}
                             role="main"
                         />
                         {previewBar}
@@ -2593,15 +2600,15 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
                 onAppsClick = null;
                 onForgetClick = null;
                 onSearchClick = null;
-                if (this.state.room.canInvite(this.context.client.getSafeUserId())) {
+                if (this.state.room.canInvite(this.props.context.client.getSafeUserId())) {
                     onInviteClick = this.onInviteClick;
                 }
                 viewingCall = true;
         }
 
-        const myMember = this.state.room!.getMember(this.context.client!.getSafeUserId());
+        const myMember = this.state.room!.getMember(this.props.context.client!.getSafeUserId());
         const showForgetButton =
-            !this.context.client.isGuest() &&
+            !this.props.context.client.isGuest() &&
             (([KnownMembership.Leave, KnownMembership.Ban] as Array<string>).includes(myMembership) ||
                 myMember?.isKicked());
 
@@ -2665,4 +2672,6 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
     }
 }
 
-export default RoomView;
+export default forwardRef<RoomView, Omit<IRoomProps, "context">>((props, ref) => (
+    <SDKContext.Consumer>{(context) => <RoomView {...props} context={context} ref={ref} />}</SDKContext.Consumer>
+));
diff --git a/src/components/structures/SpaceRoomView.tsx b/src/components/structures/SpaceRoomView.tsx
index edc857edaf0..5fe4d7d8baf 100644
--- a/src/components/structures/SpaceRoomView.tsx
+++ b/src/components/structures/SpaceRoomView.tsx
@@ -19,7 +19,7 @@ import { KnownMembership } from "matrix-js-sdk/src/types";
 import { logger } from "matrix-js-sdk/src/logger";
 import React, { useCallback, useContext, useRef, useState } from "react";
 
-import MatrixClientContext from "../../contexts/MatrixClientContext";
+import MatrixClientContext, { MatrixClientProps, withMatrixClientHOC } from "../../contexts/MatrixClientContext";
 import createRoom, { IOpts } from "../../createRoom";
 import { shouldShowComponent } from "../../customisations/helpers/UIComponents";
 import { Action } from "../../dispatcher/actions";
@@ -76,7 +76,7 @@ import RightPanel from "./RightPanel";
 import SpaceHierarchy, { showRoom } from "./SpaceHierarchy";
 import { RoomPermalinkCreator } from "../../utils/permalinks/Permalinks";
 
-interface IProps {
+interface IProps extends MatrixClientProps {
     space: Room;
     justCreatedOpts?: IOpts;
     resizeNotifier: ResizeNotifier;
@@ -603,19 +603,16 @@ const SpaceSetupPrivateInvite: React.FC<{
     );
 };
 
-export default class SpaceRoomView extends React.PureComponent<IProps, IState> {
-    public static contextType = MatrixClientContext;
-    public context!: React.ContextType<typeof MatrixClientContext>;
-
+class SpaceRoomView extends React.PureComponent<IProps, IState> {
     private readonly dispatcherRef: string;
 
-    public constructor(props: IProps, context: React.ContextType<typeof MatrixClientContext>) {
-        super(props, context);
+    public constructor(props: IProps) {
+        super(props);
 
         let phase = Phase.Landing;
 
         const creator = this.props.space.currentState.getStateEvents(EventType.RoomCreate, "")?.getSender();
-        const showSetup = this.props.justCreatedOpts && context.getSafeUserId() === creator;
+        const showSetup = this.props.justCreatedOpts && props.mxClient.getSafeUserId() === creator;
 
         if (showSetup) {
             phase =
@@ -635,13 +632,13 @@ export default class SpaceRoomView extends React.PureComponent<IProps, IState> {
     }
 
     public componentDidMount(): void {
-        this.context.on(RoomEvent.MyMembership, this.onMyMembership);
+        this.props.mxClient.on(RoomEvent.MyMembership, this.onMyMembership);
     }
 
     public componentWillUnmount(): void {
         defaultDispatcher.unregister(this.dispatcherRef);
         RightPanelStore.instance.off(UPDATE_EVENT, this.onRightPanelStoreUpdate);
-        this.context.off(RoomEvent.MyMembership, this.onMyMembership);
+        this.props.mxClient.off(RoomEvent.MyMembership, this.onMyMembership);
     }
 
     private onMyMembership = (room: Room, myMembership: string): void => {
@@ -780,3 +777,5 @@ export default class SpaceRoomView extends React.PureComponent<IProps, IState> {
         );
     }
 }
+
+export default withMatrixClientHOC(SpaceRoomView);
diff --git a/src/components/structures/ThreadPanel.tsx b/src/components/structures/ThreadPanel.tsx
index d1e83601747..7dab4d68967 100644
--- a/src/components/structures/ThreadPanel.tsx
+++ b/src/components/structures/ThreadPanel.tsx
@@ -230,7 +230,7 @@ const EmptyThread: React.FC<EmptyThreadIProps> = ({ hasThreads, filterOption, sh
 const ThreadPanel: React.FC<IProps> = ({ roomId, onClose, permalinkCreator }) => {
     const mxClient = useContext(MatrixClientContext);
     const roomContext = useContext(RoomContext);
-    const timelinePanel = useRef<TimelinePanel | null>(null);
+    const timelinePanel = useRef<React.ComponentRef<typeof TimelinePanel> | null>(null);
     const card = useRef<HTMLDivElement | null>(null);
     const closeButonRef = useRef<HTMLDivElement | null>(null);
 
diff --git a/src/components/structures/ThreadView.tsx b/src/components/structures/ThreadView.tsx
index a345faf9f74..57c77e1ed8e 100644
--- a/src/components/structures/ThreadView.tsx
+++ b/src/components/structures/ThreadView.tsx
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, { createRef, KeyboardEvent } from "react";
+import React, { createRef, forwardRef, KeyboardEvent } from "react";
 import {
     Thread,
     THREAD_RELATION_TYPE,
@@ -70,6 +70,7 @@ interface IProps {
     initialEvent?: MatrixEvent;
     isInitialEventHighlighted?: boolean;
     initialEventScrollIntoView?: boolean;
+    context: React.ContextType<typeof RoomContext>;
 }
 
 interface IState {
@@ -81,13 +82,10 @@ interface IState {
     narrow: boolean;
 }
 
-export default class ThreadView extends React.Component<IProps, IState> {
-    public static contextType = RoomContext;
-    public context!: React.ContextType<typeof RoomContext>;
-
+class ThreadView extends React.Component<IProps, IState> {
     private dispatcherRef: string | null = null;
     private readonly layoutWatcherRef: string;
-    private timelinePanel = createRef<TimelinePanel>();
+    private timelinePanel = createRef<React.ComponentRef<typeof TimelinePanel>>();
     private card = createRef<HTMLDivElement>();
 
     // Set by setEventId in ctor.
@@ -398,12 +396,12 @@ export default class ThreadView extends React.Component<IProps, IState> {
                     <TimelinePanel
                         key={this.state.thread.id}
                         ref={this.timelinePanel}
-                        showReadReceipts={this.context.showReadReceipts}
+                        showReadReceipts={this.props.context.showReadReceipts}
                         manageReadReceipts={true}
                         manageReadMarkers={true}
                         sendReadReceiptOnLoad={true}
                         timelineSet={this.state.thread.timelineSet}
-                        showUrlPreview={this.context.showUrlPreview}
+                        showUrlPreview={this.props.context.showUrlPreview}
                         // ThreadView doesn't support IRC layout at this time
                         layout={this.state.layout === Layout.Bubble ? Layout.Bubble : Layout.Group}
                         hideThreadedMessages={false}
@@ -431,7 +429,7 @@ export default class ThreadView extends React.Component<IProps, IState> {
         return (
             <RoomContext.Provider
                 value={{
-                    ...this.context,
+                    ...this.props.context,
                     timelineRenderingType: TimelineRenderingType.Thread,
                     threadId: this.state.thread?.id,
                     liveTimeline: this.state?.thread?.timelineSet?.getLiveTimeline(),
@@ -474,3 +472,7 @@ export default class ThreadView extends React.Component<IProps, IState> {
         );
     }
 }
+
+export default forwardRef<ThreadView, Omit<IProps, "context">>((props, ref) => (
+    <RoomContext.Consumer>{(context) => <ThreadView {...props} context={context} ref={ref} />}</RoomContext.Consumer>
+));
diff --git a/src/components/structures/TimelinePanel.tsx b/src/components/structures/TimelinePanel.tsx
index 288c65972f1..f8dbccf28c3 100644
--- a/src/components/structures/TimelinePanel.tsx
+++ b/src/components/structures/TimelinePanel.tsx
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, { createRef, ReactNode } from "react";
+import React, { createRef, forwardRef, ReactNode } from "react";
 import ReactDOM from "react-dom";
 import {
     Room,
@@ -166,6 +166,7 @@ interface IProps {
 
     hideThreadedMessages?: boolean;
     disableGrouping?: boolean;
+    context: React.ContextType<typeof RoomContext>;
 }
 
 interface IState {
@@ -243,10 +244,7 @@ interface IEventIndexOpts {
  *
  * Also responsible for handling and sending read receipts.
  */
-class TimelinePanel extends React.Component<IProps, IState> {
-    public static contextType = RoomContext;
-    public context!: React.ContextType<typeof RoomContext>;
-
+export class TimelinePanel extends React.Component<IProps, IState> {
     // a map from room id to read marker event timestamp
     public static roomReadMarkerTsMap: Record<string, number> = {};
 
@@ -263,7 +261,7 @@ class TimelinePanel extends React.Component<IProps, IState> {
     private lastRRSentEventId: string | null | undefined = undefined;
     private lastRMSentEventId: string | null | undefined = undefined;
 
-    private readonly messagePanel = createRef<MessagePanel>();
+    private readonly messagePanel = createRef<React.ComponentRef<typeof MessagePanel>>();
     private readonly dispatcherRef: string;
     private timelineWindow?: TimelineWindow;
     private overlayTimelineWindow?: TimelineWindow;
@@ -275,9 +273,8 @@ class TimelinePanel extends React.Component<IProps, IState> {
     private callEventGroupers = new Map<string, LegacyCallEventGrouper>();
     private initialReadMarkerId: string | null = null;
 
-    public constructor(props: IProps, context: React.ContextType<typeof RoomContext>) {
-        super(props, context);
-        this.context = context;
+    public constructor(props: IProps) {
+        super(props);
 
         debuglog("mounting");
 
@@ -499,7 +496,7 @@ class TimelinePanel extends React.Component<IProps, IState> {
         }
 
         logger.debug(
-            `TimelinePanel(${this.context.timelineRenderingType}): Debugging info for ${room?.roomId}\n` +
+            `TimelinePanel(${this.props.context.timelineRenderingType}): Debugging info for ${room?.roomId}\n` +
                 `\tevents(${eventIdList.length})=${JSON.stringify(eventIdList)}\n` +
                 `\trenderedEventIds(${renderedEventIds?.length ?? 0})=` +
                 `${JSON.stringify(renderedEventIds)}\n` +
@@ -735,7 +732,7 @@ class TimelinePanel extends React.Component<IProps, IState> {
             return;
         }
 
-        if (!Thread.hasServerSideSupport && this.context.timelineRenderingType === TimelineRenderingType.Thread) {
+        if (!Thread.hasServerSideSupport && this.props.context.timelineRenderingType === TimelineRenderingType.Thread) {
             if (toStartOfTimeline && !this.state.canBackPaginate) {
                 this.setState({
                     canBackPaginate: true,
@@ -997,8 +994,8 @@ class TimelinePanel extends React.Component<IProps, IState> {
 
     private readMarkerTimeout(readMarkerPosition: number | null): number {
         return readMarkerPosition === 0
-            ? this.context?.readMarkerInViewThresholdMs ?? this.state.readMarkerInViewThresholdMs
-            : this.context?.readMarkerOutOfViewThresholdMs ?? this.state.readMarkerOutOfViewThresholdMs;
+            ? this.props.context?.readMarkerInViewThresholdMs ?? this.state.readMarkerInViewThresholdMs
+            : this.props.context?.readMarkerOutOfViewThresholdMs ?? this.state.readMarkerOutOfViewThresholdMs;
     }
 
     private async updateReadMarkerOnUserActivity(): Promise<void> {
@@ -1775,8 +1772,8 @@ class TimelinePanel extends React.Component<IProps, IState> {
                         pendingEvents,
                     );
 
-                    if (this.context.timelineRenderingType === TimelineRenderingType.Thread) {
-                        return threadId === this.context.threadId;
+                    if (this.props.context.timelineRenderingType === TimelineRenderingType.Thread) {
+                        return threadId === this.props.context.threadId;
                     }
                     {
                         return shouldLiveInRoom;
@@ -1807,7 +1804,7 @@ class TimelinePanel extends React.Component<IProps, IState> {
         const room = this.props.timelineSet.room;
 
         const isThreadTimeline = [TimelineRenderingType.Thread, TimelineRenderingType.ThreadsList].includes(
-            this.context.timelineRenderingType,
+            this.props.context.timelineRenderingType,
         );
         if (events.length === 0 || !room || !cli.isRoomEncrypted(room.roomId) || isThreadTimeline) {
             logger.debug("checkForPreJoinUISI: showing all messages, skipping check");
@@ -1876,7 +1873,7 @@ class TimelinePanel extends React.Component<IProps, IState> {
         /* Threads do not have server side support for read receipts and the concept
         is very tied to the main room timeline, we are forcing the timeline to
         send read receipts for threaded events */
-        if (this.context.timelineRenderingType === TimelineRenderingType.Thread) {
+        if (this.props.context.timelineRenderingType === TimelineRenderingType.Thread) {
             return 0;
         }
         const index = this.state.events.findIndex((ev) => ev.getId() === evId);
@@ -1976,7 +1973,7 @@ class TimelinePanel extends React.Component<IProps, IState> {
                 !!ev.status || // local echo
                 (ignoreOwn && ev.getSender() === myUserId); // own message
             const isWithoutTile =
-                !haveRendererForEvent(ev, MatrixClientPeg.safeGet(), this.context?.showHiddenEvents) ||
+                !haveRendererForEvent(ev, MatrixClientPeg.safeGet(), this.props.context?.showHiddenEvents) ||
                 shouldHideEvent(ev, this.context);
 
             if (isWithoutTile || !node) {
@@ -2142,10 +2139,10 @@ class TimelinePanel extends React.Component<IProps, IState> {
                 onScroll={this.onMessageListScroll}
                 onFillRequest={this.onMessageListFillRequest}
                 onUnfillRequest={this.onMessageListUnfillRequest}
-                isTwelveHour={this.context?.showTwelveHourTimestamps ?? this.state.isTwelveHour}
+                isTwelveHour={this.props.context?.showTwelveHourTimestamps ?? this.state.isTwelveHour}
                 alwaysShowTimestamps={
                     this.props.alwaysShowTimestamps ??
-                    this.context?.alwaysShowTimestamps ??
+                    this.props.context?.alwaysShowTimestamps ??
                     this.state.alwaysShowTimestamps
                 }
                 className={this.props.className}
@@ -2188,4 +2185,6 @@ function serializeEventIdsFromTimelineSets(timelineSets: EventTimelineSet[]): {
     return serializedEventIdsInTimelineSet;
 }
 
-export default TimelinePanel;
+export default forwardRef<TimelinePanel, Omit<IProps, "context">>((props, ref) => (
+    <RoomContext.Consumer>{(context) => <TimelinePanel {...props} context={context} ref={ref} />}</RoomContext.Consumer>
+));
diff --git a/src/components/structures/UserMenu.tsx b/src/components/structures/UserMenu.tsx
index f24fa57d7d8..1a65e70b4c6 100644
--- a/src/components/structures/UserMenu.tsx
+++ b/src/components/structures/UserMenu.tsx
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, { createRef, ReactNode } from "react";
+import React, { createRef, forwardRef, ReactNode } from "react";
 import { Room } from "matrix-js-sdk/src/matrix";
 
 import { MatrixClientPeg } from "../../MatrixClientPeg";
@@ -56,6 +56,7 @@ import { shouldShowFeedback } from "../../utils/Feedback";
 interface IProps {
     isPanelCollapsed: boolean;
     children?: ReactNode;
+    context: React.ContextType<typeof SDKContext>;
 }
 
 type PartialDOMRect = Pick<DOMRect, "width" | "left" | "top" | "height">;
@@ -84,25 +85,21 @@ const below = (rect: PartialDOMRect): MenuProps => {
     };
 };
 
-export default class UserMenu extends React.Component<IProps, IState> {
-    public static contextType = SDKContext;
-    public context!: React.ContextType<typeof SDKContext>;
-
+class UserMenu extends React.Component<IProps, IState> {
     private dispatcherRef?: string;
     private themeWatcherRef?: string;
     private readonly dndWatcherRef?: string;
     private buttonRef: React.RefObject<HTMLButtonElement> = createRef();
 
-    public constructor(props: IProps, context: React.ContextType<typeof SDKContext>) {
-        super(props, context);
+    public constructor(props: IProps) {
+        super(props);
 
-        this.context = context;
         this.state = {
             contextMenuPosition: null,
             isDarkTheme: this.isUserOnDarkTheme(),
             isHighContrast: this.isUserOnHighContrastTheme(),
             selectedSpace: SpaceStore.instance.activeSpaceRoom,
-            showLiveAvatarAddon: this.context.voiceBroadcastRecordingsStore.hasCurrent(),
+            showLiveAvatarAddon: this.props.context.voiceBroadcastRecordingsStore.hasCurrent(),
         };
 
         OwnProfileStore.instance.on(UPDATE_EVENT, this.onProfileUpdate);
@@ -110,7 +107,7 @@ export default class UserMenu extends React.Component<IProps, IState> {
     }
 
     private get hasHomePage(): boolean {
-        return !!getHomePageUrl(SdkConfig.get(), this.context.client!);
+        return !!getHomePageUrl(SdkConfig.get(), this.props.context.client!);
     }
 
     private onCurrentVoiceBroadcastRecordingChanged = (recording: VoiceBroadcastRecording | null): void => {
@@ -120,7 +117,7 @@ export default class UserMenu extends React.Component<IProps, IState> {
     };
 
     public componentDidMount(): void {
-        this.context.voiceBroadcastRecordingsStore.on(
+        this.props.context.voiceBroadcastRecordingsStore.on(
             VoiceBroadcastRecordingsStoreEvent.CurrentChanged,
             this.onCurrentVoiceBroadcastRecordingChanged,
         );
@@ -134,7 +131,7 @@ export default class UserMenu extends React.Component<IProps, IState> {
         if (this.dispatcherRef) defaultDispatcher.unregister(this.dispatcherRef);
         OwnProfileStore.instance.off(UPDATE_EVENT, this.onProfileUpdate);
         SpaceStore.instance.off(UPDATE_SELECTED_SPACE, this.onSelectedSpaceUpdate);
-        this.context.voiceBroadcastRecordingsStore.off(
+        this.props.context.voiceBroadcastRecordingsStore.off(
             VoiceBroadcastRecordingsStoreEvent.CurrentChanged,
             this.onCurrentVoiceBroadcastRecordingChanged,
         );
@@ -496,3 +493,7 @@ export default class UserMenu extends React.Component<IProps, IState> {
         );
     }
 }
+
+export default forwardRef<UserMenu, Omit<IProps, "context">>((props, ref) => (
+    <SDKContext.Consumer>{(context) => <UserMenu {...props} context={context} ref={ref} />}</SDKContext.Consumer>
+));
diff --git a/src/components/structures/UserView.tsx b/src/components/structures/UserView.tsx
index 4d5dd258e01..846dcc2b11c 100644
--- a/src/components/structures/UserView.tsx
+++ b/src/components/structures/UserView.tsx
@@ -27,9 +27,9 @@ import Spinner from "../views/elements/Spinner";
 import ResizeNotifier from "../../utils/ResizeNotifier";
 import { RightPanelPhases } from "../../stores/right-panel/RightPanelStorePhases";
 import { UserOnboardingPage } from "../views/user-onboarding/UserOnboardingPage";
-import MatrixClientContext from "../../contexts/MatrixClientContext";
+import { MatrixClientProps, withMatrixClientHOC } from "../../contexts/MatrixClientContext";
 
-interface IProps {
+interface IProps extends MatrixClientProps {
     userId: string;
     resizeNotifier: ResizeNotifier;
 }
@@ -39,10 +39,7 @@ interface IState {
     member?: RoomMember;
 }
 
-export default class UserView extends React.Component<IProps, IState> {
-    public static contextType = MatrixClientContext;
-    public context!: React.ContextType<typeof MatrixClientContext>;
-
+class UserView extends React.Component<IProps, IState> {
     public constructor(props: IProps) {
         super(props);
         this.state = {
@@ -69,7 +66,7 @@ export default class UserView extends React.Component<IProps, IState> {
         this.setState({ loading: true });
         let profileInfo: Awaited<ReturnType<MatrixClient["getProfileInfo"]>>;
         try {
-            profileInfo = await this.context.getProfileInfo(this.props.userId);
+            profileInfo = await this.props.mxClient.getProfileInfo(this.props.userId);
         } catch (err) {
             Modal.createDialog(ErrorDialog, {
                 title: _t("error_dialog|error_loading_user_profile"),
@@ -105,3 +102,5 @@ export default class UserView extends React.Component<IProps, IState> {
         }
     }
 }
+
+export default withMatrixClientHOC(UserView);
diff --git a/src/components/structures/WaitingForThirdPartyRoomView.tsx b/src/components/structures/WaitingForThirdPartyRoomView.tsx
index 1b61abb3bb8..2b16642718f 100644
--- a/src/components/structures/WaitingForThirdPartyRoomView.tsx
+++ b/src/components/structures/WaitingForThirdPartyRoomView.tsx
@@ -26,7 +26,7 @@ import RoomHeader from "../views/rooms/RoomHeader";
 import ScrollPanel from "./ScrollPanel";
 import EventTileBubble from "../views/messages/EventTileBubble";
 import NewRoomIntro from "../views/rooms/NewRoomIntro";
-import { UnwrappedEventTile } from "../views/rooms/EventTile";
+import EventTile from "../views/rooms/EventTile";
 import { _t } from "../../languageHandler";
 import SdkConfig from "../../SdkConfig";
 import SettingsStore from "../../settings/SettingsStore";
@@ -53,7 +53,7 @@ export const WaitingForThirdPartyRoomView: React.FC<Props> = ({ roomView, resize
                     <RoomHeader room={context.room!} />
                 ) : (
                     <LegacyRoomHeader
-                        room={context.room}
+                        room={context.room!}
                         inRoom={true}
                         onSearchClick={null}
                         onInviteClick={null}
@@ -77,7 +77,7 @@ export const WaitingForThirdPartyRoomView: React.FC<Props> = ({ roomView, resize
                                 subtitle={_t("room|waiting_for_join_subtitle", { brand })}
                             />
                             <NewRoomIntro />
-                            <UnwrappedEventTile mxEvent={inviteEvent} />
+                            <EventTile mxEvent={inviteEvent} />
                         </ScrollPanel>
                     </div>
                 </main>
diff --git a/src/components/structures/auth/SoftLogout.tsx b/src/components/structures/auth/SoftLogout.tsx
index f623ae7dcbb..5fd1bb422b2 100644
--- a/src/components/structures/auth/SoftLogout.tsx
+++ b/src/components/structures/auth/SoftLogout.tsx
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, { ChangeEvent, SyntheticEvent } from "react";
+import React, { ChangeEvent, forwardRef, SyntheticEvent } from "react";
 import { logger } from "matrix-js-sdk/src/logger";
 import { Optional } from "matrix-events-sdk";
 import { LoginFlow, MatrixError, SSOAction, SSOFlow } from "matrix-js-sdk/src/matrix";
@@ -60,6 +60,7 @@ interface IProps {
 
     // Called when the SSO login completes
     onTokenLoginCompleted: () => void;
+    context: React.ContextType<typeof SDKContext>;
 }
 
 interface IState {
@@ -70,14 +71,9 @@ interface IState {
     flows: LoginFlow[];
 }
 
-export default class SoftLogout extends React.Component<IProps, IState> {
-    public static contextType = SDKContext;
-    public context!: React.ContextType<typeof SDKContext>;
-
-    public constructor(props: IProps, context: React.ContextType<typeof SDKContext>) {
-        super(props, context);
-
-        this.context = context;
+class SoftLogout extends React.Component<IProps, IState> {
+    public constructor(props: IProps) {
+        super(props);
 
         this.state = {
             loginView: LoginView.Loading,
@@ -104,7 +100,7 @@ export default class SoftLogout extends React.Component<IProps, IState> {
                 if (!wipeData) return;
 
                 logger.log("Clearing data from soft-logged-out session");
-                Lifecycle.logout(this.context.oidcClientStore);
+                Lifecycle.logout(this.props.context.oidcClientStore);
             },
         });
     };
@@ -338,3 +334,7 @@ export default class SoftLogout extends React.Component<IProps, IState> {
         );
     }
 }
+
+export default forwardRef<SoftLogout, Omit<IProps, "context">>((props, ref) => (
+    <SDKContext.Consumer>{(context) => <SoftLogout {...props} context={context} ref={ref} />}</SDKContext.Consumer>
+));
diff --git a/src/components/structures/grouper/BaseGrouper.ts b/src/components/structures/grouper/BaseGrouper.ts
index 5821797ad54..57b07e4f2b3 100644
--- a/src/components/structures/grouper/BaseGrouper.ts
+++ b/src/components/structures/grouper/BaseGrouper.ts
@@ -31,7 +31,7 @@ import MessagePanel, { WrappedEvent } from "../MessagePanel";
  *   when determining things such as whether a date separator is necessary
  */
 export abstract class BaseGrouper {
-    public static canStartGroup = (_panel: MessagePanel, _ev: WrappedEvent): boolean => true;
+    public static canStartGroup = (_panel: React.ComponentRef<typeof MessagePanel>, _ev: WrappedEvent): boolean => true;
 
     public events: WrappedEvent[] = [];
     // events that we include in the group but then eject out and place above the group.
@@ -39,7 +39,7 @@ export abstract class BaseGrouper {
     public readMarker: ReactNode;
 
     public constructor(
-        public readonly panel: MessagePanel,
+        public readonly panel: React.ComponentRef<typeof MessagePanel>,
         public readonly firstEventAndShouldShow: WrappedEvent,
         public readonly prevEvent: MatrixEvent | null,
         public readonly lastShownEvent: MatrixEvent | undefined,
diff --git a/src/components/structures/grouper/CreationGrouper.tsx b/src/components/structures/grouper/CreationGrouper.tsx
index fa91a1bd90c..bcb5552968c 100644
--- a/src/components/structures/grouper/CreationGrouper.tsx
+++ b/src/components/structures/grouper/CreationGrouper.tsx
@@ -33,7 +33,10 @@ import { SeparatorKind } from "../../views/messages/TimelineSeparator";
 // the first non-state event, beacon_info event or membership event which is not regarding the sender of the `m.room.create` event
 
 export class CreationGrouper extends BaseGrouper {
-    public static canStartGroup = function (_panel: MessagePanel, { event }: WrappedEvent): boolean {
+    public static canStartGroup = function (
+        _panel: React.ComponentRef<typeof MessagePanel>,
+        { event }: WrappedEvent,
+    ): boolean {
         return event.getType() === EventType.RoomCreate;
     };
 
diff --git a/src/components/structures/grouper/MainGrouper.tsx b/src/components/structures/grouper/MainGrouper.tsx
index 28a62d7ac9d..721bc93c9c4 100644
--- a/src/components/structures/grouper/MainGrouper.tsx
+++ b/src/components/structures/grouper/MainGrouper.tsx
@@ -36,7 +36,10 @@ const groupedStateEvents = [
 
 // Wrap consecutive grouped events in a ListSummary
 export class MainGrouper extends BaseGrouper {
-    public static canStartGroup = function (panel: MessagePanel, { event: ev, shouldShow }: WrappedEvent): boolean {
+    public static canStartGroup = function (
+        panel: React.ComponentRef<typeof MessagePanel>,
+        { event: ev, shouldShow }: WrappedEvent,
+    ): boolean {
         if (!shouldShow) return false;
 
         if (ev.isState() && groupedStateEvents.includes(ev.getType() as EventType)) {
@@ -55,7 +58,7 @@ export class MainGrouper extends BaseGrouper {
     };
 
     public constructor(
-        public readonly panel: MessagePanel,
+        public readonly panel: React.ComponentRef<typeof MessagePanel>,
         public readonly firstEventAndShouldShow: WrappedEvent,
         public readonly prevEvent: MatrixEvent | null,
         public readonly lastShownEvent: MatrixEvent | undefined,
diff --git a/src/components/views/context_menus/MessageContextMenu.tsx b/src/components/views/context_menus/MessageContextMenu.tsx
index e0fca0a4c0b..f7fd4926e08 100644
--- a/src/components/views/context_menus/MessageContextMenu.tsx
+++ b/src/components/views/context_menus/MessageContextMenu.tsx
@@ -16,7 +16,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, { createRef, useContext } from "react";
+import React, { createRef, forwardRef, useContext } from "react";
 import {
     EventStatus,
     MatrixEvent,
@@ -123,6 +123,7 @@ interface IProps extends MenuProps {
     link?: string;
 
     getRelationsForEvent?: GetRelationsForEvent;
+    context: React.ContextType<typeof RoomContext>;
 }
 
 interface IState {
@@ -131,11 +132,8 @@ interface IState {
     reactionPickerDisplayed: boolean;
 }
 
-export default class MessageContextMenu extends React.Component<IProps, IState> {
-    public static contextType = RoomContext;
-    public context!: React.ContextType<typeof RoomContext>;
-
-    private reactButtonRef = createRef<any>(); // XXX Ref to a functional component
+class MessageContextMenu extends React.Component<IProps, IState> {
+    private reactButtonRef = createRef<HTMLElement>();
 
     public constructor(props: IProps) {
         super(props);
@@ -315,7 +313,7 @@ export default class MessageContextMenu extends React.Component<IProps, IState>
         editEvent(
             MatrixClientPeg.safeGet(),
             this.props.mxEvent,
-            this.context.timelineRenderingType,
+            this.props.context.timelineRenderingType,
             this.props.getRelationsForEvent,
         );
         this.closeMenu();
@@ -325,7 +323,7 @@ export default class MessageContextMenu extends React.Component<IProps, IState>
         dis.dispatch({
             action: "reply_to_event",
             event: this.props.mxEvent,
-            context: this.context.timelineRenderingType,
+            context: this.props.context.timelineRenderingType,
         });
         this.closeMenu();
     };
@@ -393,7 +391,7 @@ export default class MessageContextMenu extends React.Component<IProps, IState>
         const permalink = this.props.permalinkCreator?.forEvent(this.props.mxEvent.getId()!);
         // status is SENT before remote-echo, null after
         const isSent = !eventStatus || eventStatus === EventStatus.SENT;
-        const { timelineRenderingType, canReact, canSendMessages } = this.context;
+        const { timelineRenderingType, canReact, canSendMessages } = this.props.context;
         const isThread =
             timelineRenderingType === TimelineRenderingType.Thread ||
             timelineRenderingType === TimelineRenderingType.ThreadsList;
@@ -733,3 +731,9 @@ export default class MessageContextMenu extends React.Component<IProps, IState>
         );
     }
 }
+
+export default forwardRef<MessageContextMenu, Omit<IProps, "context">>((props, ref) => (
+    <RoomContext.Consumer>
+        {(context) => <MessageContextMenu {...props} context={context} ref={ref} />}
+    </RoomContext.Consumer>
+));
diff --git a/src/components/views/dialogs/CreateRoomDialog.tsx b/src/components/views/dialogs/CreateRoomDialog.tsx
index a1fdc13f299..208a319d748 100644
--- a/src/components/views/dialogs/CreateRoomDialog.tsx
+++ b/src/components/views/dialogs/CreateRoomDialog.tsx
@@ -24,7 +24,7 @@ import { _t } from "../../../languageHandler";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import { checkUserIsAllowedToChangeEncryption, IOpts } from "../../../createRoom";
 import Field from "../elements/Field";
-import RoomAliasField from "../elements/RoomAliasField";
+import RoomAliasField, { RoomAliasField as RoomAliasFieldClass } from "../elements/RoomAliasField";
 import LabelledToggleSwitch from "../elements/LabelledToggleSwitch";
 import DialogButtons from "../elements/DialogButtons";
 import BaseDialog from "../dialogs/BaseDialog";
@@ -93,7 +93,7 @@ export default class CreateRoomDialog extends React.Component<IProps, IState> {
     private readonly askToJoinEnabled: boolean;
     private readonly supportsRestricted: boolean;
     private nameField = createRef<Field>();
-    private aliasField = createRef<RoomAliasField>();
+    private aliasField = createRef<RoomAliasFieldClass>();
 
     public constructor(props: IProps) {
         super(props);
@@ -197,7 +197,7 @@ export default class CreateRoomDialog extends React.Component<IProps, IState> {
         if (this.state.nameIsValid && (!this.aliasField.current || this.aliasField.current.isValid)) {
             this.props.onFinished(true, this.roomCreateOptions());
         } else {
-            let field: RoomAliasField | Field | null = null;
+            let field: RoomAliasFieldClass | Field | null = null;
             if (!this.state.nameIsValid) {
                 field = this.nameField.current;
             } else if (this.aliasField.current && !this.aliasField.current.isValid) {
diff --git a/src/components/views/dialogs/CreateSubspaceDialog.tsx b/src/components/views/dialogs/CreateSubspaceDialog.tsx
index 3804e71f7d7..9c7dbb13401 100644
--- a/src/components/views/dialogs/CreateSubspaceDialog.tsx
+++ b/src/components/views/dialogs/CreateSubspaceDialog.tsx
@@ -24,7 +24,7 @@ import AccessibleButton, { ButtonEvent } from "../elements/AccessibleButton";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import { BetaPill } from "../beta/BetaCard";
 import Field from "../elements/Field";
-import RoomAliasField from "../elements/RoomAliasField";
+import { RoomAliasField } from "../elements/RoomAliasField";
 import { createSpace, SpaceCreateForm } from "../spaces/SpaceCreateMenu";
 import { SubspaceSelector } from "./AddExistingToSpaceDialog";
 import JoinRuleDropdown from "../elements/JoinRuleDropdown";
diff --git a/src/components/views/elements/AppTile.tsx b/src/components/views/elements/AppTile.tsx
index 7a1b641791a..84f9b49f489 100644
--- a/src/components/views/elements/AppTile.tsx
+++ b/src/components/views/elements/AppTile.tsx
@@ -17,7 +17,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, { ContextType, createRef, CSSProperties, MutableRefObject, ReactNode } from "react";
+import React, { createRef, CSSProperties, MutableRefObject, ReactNode } from "react";
 import classNames from "classnames";
 import { IWidget, MatrixCapabilities } from "matrix-widget-api";
 import { Room, RoomEvent } from "matrix-js-sdk/src/matrix";
@@ -50,7 +50,7 @@ import { Container, WidgetLayoutStore } from "../../../stores/widgets/WidgetLayo
 import { OwnProfileStore } from "../../../stores/OwnProfileStore";
 import { UPDATE_EVENT } from "../../../stores/AsyncStore";
 import WidgetUtils from "../../../utils/WidgetUtils";
-import MatrixClientContext from "../../../contexts/MatrixClientContext";
+import { MatrixClientProps, withMatrixClientHOC } from "../../../contexts/MatrixClientContext";
 import { ActionPayload } from "../../../dispatcher/payloads";
 import { Action } from "../../../dispatcher/actions";
 import { ElementWidgetCapabilities } from "../../../stores/widgets/ElementWidgetCapabilities";
@@ -59,7 +59,7 @@ import { SdkContextClass } from "../../../contexts/SDKContext";
 import { ModuleRunner } from "../../../modules/ModuleRunner";
 import { parseUrl } from "../../../utils/UrlUtils";
 
-interface IProps {
+interface IProps extends MatrixClientProps {
     app: IWidget | IApp;
     // If room is not specified then it is an account level widget
     // which bypasses permission prompts as it was added explicitly by that user
@@ -71,10 +71,10 @@ interface IProps {
     // Optional. If set, renders a smaller view of the widget
     miniMode?: boolean;
     // UserId of the current user
-    userId: string;
+    userId?: string;
     // UserId of the entity that added / modified the widget
-    creatorUserId: string;
-    waitForIframeLoad: boolean;
+    creatorUserId?: string;
+    waitForIframeLoad?: boolean;
     showMenubar?: boolean;
     // Optional onEditClickHandler (overrides default behaviour)
     onEditClick?: () => void;
@@ -87,7 +87,7 @@ interface IProps {
     // Optionally hide the popout widget icon
     showPopout?: boolean;
     // Is this an instance of a user widget
-    userWidget: boolean;
+    userWidget?: boolean;
     // sets the pointer-events property on the iframe
     pointerEvents?: CSSProperties["pointerEvents"];
     widgetPageTitle?: string;
@@ -118,10 +118,7 @@ interface IState {
     hasContextMenuOptions: boolean;
 }
 
-export default class AppTile extends React.Component<IProps, IState> {
-    public static contextType = MatrixClientContext;
-    public context!: ContextType<typeof MatrixClientContext>;
-
+class AppTile extends React.Component<IProps, IState> {
     public static defaultProps: Partial<IProps> = {
         waitForIframeLoad: true,
         showMenubar: true,
@@ -142,9 +139,8 @@ export default class AppTile extends React.Component<IProps, IState> {
     private dispatcherRef?: string;
     private unmounted = false;
 
-    public constructor(props: IProps, context: ContextType<typeof MatrixClientContext>) {
+    public constructor(props: IProps) {
         super(props);
-        this.context = context; // XXX: workaround for lack of `declare` support on `public context!:` definition
 
         // Tiles in miniMode are floating, and therefore not docked
         if (!this.props.miniMode) {
@@ -264,10 +260,10 @@ export default class AppTile extends React.Component<IProps, IState> {
             menuDisplayed: false,
             requiresClient: this.determineInitialRequiresClientState(),
             hasContextMenuOptions: showContextMenu(
-                this.context,
+                this.props.mxClient,
                 this.props.room,
                 newProps.app,
-                newProps.userWidget,
+                !!newProps.userWidget,
                 !newProps.userWidget,
                 newProps.onDeleteClick,
             ),
@@ -315,7 +311,7 @@ export default class AppTile extends React.Component<IProps, IState> {
         this.watchUserReady();
 
         if (this.props.room) {
-            this.context.on(RoomEvent.MyMembership, this.onMyMembership);
+            this.props.mxClient.on(RoomEvent.MyMembership, this.onMyMembership);
         }
         this.allowedWidgetsWatchRef = SettingsStore.watchSetting("allowedWidgets", null, this.onAllowedWidgetsChange);
         // Widget action listeners
@@ -348,7 +344,7 @@ export default class AppTile extends React.Component<IProps, IState> {
         if (this.dispatcherRef) dis.unregister(this.dispatcherRef);
 
         if (this.props.room) {
-            this.context.off(RoomEvent.MyMembership, this.onMyMembership);
+            this.props.mxClient.off(RoomEvent.MyMembership, this.onMyMembership);
         }
 
         if (this.allowedWidgetsWatchRef) SettingsStore.unwatchSetting(this.allowedWidgetsWatchRef);
@@ -646,7 +642,7 @@ export default class AppTile extends React.Component<IProps, IState> {
             );
         } else if (!this.state.hasPermissionToLoad && this.props.room) {
             // only possible for room widgets, can assert this.props.room here
-            const isEncrypted = this.context.isRoomEncrypted(this.props.room.roomId);
+            const isEncrypted = this.props.mxClient.isRoomEncrypted(this.props.room.roomId);
             appTileBody = (
                 <div className={appTileBodyClass} style={appTileBodyStyles}>
                     <AppPermission
@@ -819,3 +815,5 @@ export default class AppTile extends React.Component<IProps, IState> {
         );
     }
 }
+
+export default withMatrixClientHOC(AppTile);
diff --git a/src/components/views/elements/EventListSummary.tsx b/src/components/views/elements/EventListSummary.tsx
index a1270427ccd..932f9d992a1 100644
--- a/src/components/views/elements/EventListSummary.tsx
+++ b/src/components/views/elements/EventListSummary.tsx
@@ -16,7 +16,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, { ComponentProps, ReactNode } from "react";
+import React, { ComponentProps, forwardRef, ReactNode } from "react";
 import { MatrixEvent, RoomMember, EventType } from "matrix-js-sdk/src/matrix";
 import { KnownMembership } from "matrix-js-sdk/src/types";
 
@@ -43,7 +43,8 @@ interface IProps extends Omit<ComponentProps<typeof GenericEventListSummary>, "s
     // The maximum number of avatars to display in the summary
     avatarsMaxLength?: number;
     // The currently selected layout
-    layout: Layout;
+    layout?: Layout;
+    context: React.ContextType<typeof RoomContext>;
 }
 
 interface IUserEvents {
@@ -77,12 +78,9 @@ enum TransitionType {
 
 const SEP = ",";
 
-export default class EventListSummary extends React.Component<
+class EventListSummary extends React.Component<
     IProps & Required<Pick<IProps, "summaryLength" | "threshold" | "avatarsMaxLength" | "layout">>
 > {
-    public static contextType = RoomContext;
-    public context!: React.ContextType<typeof RoomContext>;
-
     public static defaultProps = {
         summaryLength: 1,
         threshold: 3,
@@ -527,7 +525,7 @@ export default class EventListSummary extends React.Component<
 
             let displayName = userKey;
             if (e.isRedacted()) {
-                const sender = this.context?.room?.getMember(userKey);
+                const sender = this.props.context?.room?.getMember(userKey);
                 if (sender) {
                     displayName = sender.name;
                     latestUserAvatarMember.set(userKey, sender);
@@ -569,3 +567,9 @@ export default class EventListSummary extends React.Component<
         );
     }
 }
+
+export default forwardRef<EventListSummary, Omit<IProps, "context">>((props, ref) => (
+    <RoomContext.Consumer>
+        {(context) => <EventListSummary {...props} context={context} ref={ref} />}
+    </RoomContext.Consumer>
+));
diff --git a/src/components/views/elements/PersistentApp.tsx b/src/components/views/elements/PersistentApp.tsx
index 812d3432498..96dd73003d3 100644
--- a/src/components/views/elements/PersistentApp.tsx
+++ b/src/components/views/elements/PersistentApp.tsx
@@ -15,29 +15,27 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, { ContextType, CSSProperties, MutableRefObject } from "react";
+import React, { CSSProperties, MutableRefObject } from "react";
 import { Room } from "matrix-js-sdk/src/matrix";
 
 import WidgetUtils from "../../../utils/WidgetUtils";
 import AppTile from "./AppTile";
 import WidgetStore from "../../../stores/WidgetStore";
-import MatrixClientContext from "../../../contexts/MatrixClientContext";
+import { MatrixClientProps, withMatrixClientHOC } from "../../../contexts/MatrixClientContext";
 
-interface IProps {
+interface IProps extends MatrixClientProps {
     persistentWidgetId: string;
     persistentRoomId: string;
     pointerEvents?: CSSProperties["pointerEvents"];
     movePersistedElement: MutableRefObject<(() => void) | undefined>;
 }
 
-export default class PersistentApp extends React.Component<IProps> {
-    public static contextType = MatrixClientContext;
-    public context!: ContextType<typeof MatrixClientContext>;
+class PersistentApp extends React.Component<React.PropsWithChildren<IProps>> {
     private room: Room;
 
-    public constructor(props: IProps, context: ContextType<typeof MatrixClientContext>) {
-        super(props, context);
-        this.room = context.getRoom(this.props.persistentRoomId)!;
+    public constructor(props: React.PropsWithChildren<IProps>) {
+        super(props);
+        this.room = props.mxClient.getRoom(this.props.persistentRoomId)!;
     }
 
     public render(): JSX.Element | null {
@@ -50,7 +48,7 @@ export default class PersistentApp extends React.Component<IProps> {
                 app={app}
                 fullWidth={true}
                 room={this.room}
-                userId={this.context.getSafeUserId()}
+                userId={this.props.mxClient.getSafeUserId()}
                 creatorUserId={app.creatorUserId}
                 widgetPageTitle={WidgetUtils.getWidgetDataTitle(app)}
                 waitForIframeLoad={app.waitForIframeLoad}
@@ -63,3 +61,5 @@ export default class PersistentApp extends React.Component<IProps> {
         );
     }
 }
+
+export default withMatrixClientHOC(PersistentApp);
diff --git a/src/components/views/elements/ReplyChain.tsx b/src/components/views/elements/ReplyChain.tsx
index b7e833a629b..ae3d31a0350 100644
--- a/src/components/views/elements/ReplyChain.tsx
+++ b/src/components/views/elements/ReplyChain.tsx
@@ -31,7 +31,6 @@ import ReplyTile from "../rooms/ReplyTile";
 import { Pill, PillType } from "./Pill";
 import AccessibleButton from "./AccessibleButton";
 import { getParentEventId, shouldDisplayReply } from "../../../utils/Reply";
-import RoomContext from "../../../contexts/RoomContext";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import { GetRelationsForEvent } from "../rooms/EventTile";
 
@@ -72,15 +71,12 @@ interface IState {
 // craft event_id's, using a homeserver that generates predictable event IDs; even then the impact would
 // be low as each event being loaded (after the first) is triggered by an explicit user action.
 export default class ReplyChain extends React.Component<IProps, IState> {
-    public static contextType = RoomContext;
-    public context!: React.ContextType<typeof RoomContext>;
-
     private unmounted = false;
     private room: Room;
     private blockquoteRef = React.createRef<HTMLQuoteElement>();
 
-    public constructor(props: IProps, context: React.ContextType<typeof RoomContext>) {
-        super(props, context);
+    public constructor(props: IProps) {
+        super(props);
 
         this.state = {
             events: [],
diff --git a/src/components/views/elements/RoomAliasField.tsx b/src/components/views/elements/RoomAliasField.tsx
index d5353dcabc3..49687a9e6ff 100644
--- a/src/components/views/elements/RoomAliasField.tsx
+++ b/src/components/views/elements/RoomAliasField.tsx
@@ -20,9 +20,9 @@ import { MatrixError } from "matrix-js-sdk/src/matrix";
 import { _t } from "../../../languageHandler";
 import withValidation, { IFieldState, IValidationResult } from "./Validation";
 import Field, { IValidateOpts } from "./Field";
-import MatrixClientContext from "../../../contexts/MatrixClientContext";
+import { MatrixClientProps, withMatrixClientHOC } from "../../../contexts/MatrixClientContext";
 
-interface IProps {
+interface IProps extends MatrixClientProps {
     domain?: string;
     value: string;
     label?: string;
@@ -39,14 +39,11 @@ interface IState {
 }
 
 // Controlled form component wrapping Field for inputting a room alias scoped to a given domain
-export default class RoomAliasField extends React.PureComponent<IProps, IState> {
-    public static contextType = MatrixClientContext;
-    public context!: React.ContextType<typeof MatrixClientContext>;
-
+export class RoomAliasField extends React.PureComponent<IProps, IState> {
     private fieldRef = createRef<Field>();
 
-    public constructor(props: IProps, context: React.ContextType<typeof MatrixClientContext>) {
-        super(props, context);
+    public constructor(props: IProps) {
+        super(props);
 
         this.state = {
             isValid: true,
@@ -182,7 +179,7 @@ export default class RoomAliasField extends React.PureComponent<IProps, IState>
                           if (!value) {
                               return true;
                           }
-                          const client = this.context;
+                          const client = this.props.mxClient;
                           try {
                               const result = await client.getRoomIdForAlias(this.asFullAlias(value));
                               return result.room_id === this.props.roomId;
@@ -200,7 +197,7 @@ export default class RoomAliasField extends React.PureComponent<IProps, IState>
                           if (!value) {
                               return true;
                           }
-                          const client = this.context;
+                          const client = this.props.mxClient;
                           try {
                               await client.getRoomIdForAlias(this.asFullAlias(value));
                               // we got a room id, so the alias is taken
@@ -235,3 +232,5 @@ export default class RoomAliasField extends React.PureComponent<IProps, IState>
         this.fieldRef.current?.focus();
     }
 }
+
+export default withMatrixClientHOC(RoomAliasField);
diff --git a/src/components/views/emojipicker/ReactionPicker.tsx b/src/components/views/emojipicker/ReactionPicker.tsx
index 075a6e6cee7..4a671a8b126 100644
--- a/src/components/views/emojipicker/ReactionPicker.tsx
+++ b/src/components/views/emojipicker/ReactionPicker.tsx
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from "react";
+import React, { forwardRef } from "react";
 import { MatrixEvent, EventType, RelationType, Relations, RelationsEvent } from "matrix-js-sdk/src/matrix";
 
 import EmojiPicker from "./EmojiPicker";
@@ -29,6 +29,7 @@ interface IProps {
     mxEvent: MatrixEvent;
     reactions?: Relations | null | undefined;
     onFinished(): void;
+    context: React.ContextType<typeof RoomContext>;
 }
 
 interface IState {
@@ -36,11 +37,8 @@ interface IState {
 }
 
 class ReactionPicker extends React.Component<IProps, IState> {
-    public static contextType = RoomContext;
-    public context!: React.ContextType<typeof RoomContext>;
-
-    public constructor(props: IProps, context: React.ContextType<typeof RoomContext>) {
-        super(props, context);
+    public constructor(props: IProps) {
+        super(props);
 
         this.state = {
             selectedEmojis: new Set(Object.keys(this.getReactions())),
@@ -95,12 +93,12 @@ class ReactionPicker extends React.Component<IProps, IState> {
         this.props.onFinished();
         const myReactions = this.getReactions();
         if (myReactions.hasOwnProperty(reaction)) {
-            if (this.props.mxEvent.isRedacted() || !this.context.canSelfRedact) return false;
+            if (this.props.mxEvent.isRedacted() || !this.props.context.canSelfRedact) return false;
 
             MatrixClientPeg.safeGet().redactEvent(this.props.mxEvent.getRoomId()!, myReactions[reaction]);
             dis.dispatch<FocusComposerPayload>({
                 action: Action.FocusAComposer,
-                context: this.context.timelineRenderingType,
+                context: this.props.context.timelineRenderingType,
             });
             // Tell the emoji picker not to bump this in the more frequently used list.
             return false;
@@ -115,7 +113,7 @@ class ReactionPicker extends React.Component<IProps, IState> {
             dis.dispatch({ action: "message_sent" });
             dis.dispatch<FocusComposerPayload>({
                 action: Action.FocusAComposer,
-                context: this.context.timelineRenderingType,
+                context: this.props.context.timelineRenderingType,
             });
             return true;
         }
@@ -123,7 +121,7 @@ class ReactionPicker extends React.Component<IProps, IState> {
 
     private isEmojiDisabled = (unicode: string): boolean => {
         if (!this.getReactions()[unicode]) return false;
-        if (this.context.canSelfRedact) return false;
+        if (this.props.context.canSelfRedact) return false;
 
         return true;
     };
@@ -140,4 +138,8 @@ class ReactionPicker extends React.Component<IProps, IState> {
     }
 }
 
-export default ReactionPicker;
+export default forwardRef<ReactionPicker, Omit<IProps, "context">>((props, ref) => (
+    <RoomContext.Consumer>
+        {(context) => <ReactionPicker {...props} context={context} ref={ref} />}
+    </RoomContext.Consumer>
+));
diff --git a/src/components/views/emojipicker/Search.tsx b/src/components/views/emojipicker/Search.tsx
index 33549b7489a..9d4b10bed94 100644
--- a/src/components/views/emojipicker/Search.tsx
+++ b/src/components/views/emojipicker/Search.tsx
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from "react";
+import React, { forwardRef } from "react";
 
 import { _t } from "../../../languageHandler";
 import { KeyBindingAction } from "../../../accessibility/KeyboardShortcuts";
@@ -27,12 +27,10 @@ interface IProps {
     onChange(value: string): void;
     onEnter(): void;
     onKeyDown(event: React.KeyboardEvent): void;
+    context: React.ContextType<typeof RovingTabIndexContext>;
 }
 
 class Search extends React.PureComponent<IProps> {
-    public static contextType = RovingTabIndexContext;
-    public context!: React.ContextType<typeof RovingTabIndexContext>;
-
     private inputRef = React.createRef<HTMLInputElement>();
 
     public componentDidMount(): void {
@@ -78,7 +76,7 @@ class Search extends React.PureComponent<IProps> {
                     onChange={(ev) => this.props.onChange(ev.target.value)}
                     onKeyDown={this.onKeyDown}
                     ref={this.inputRef}
-                    aria-activedescendant={this.context.state.activeRef?.current?.id}
+                    aria-activedescendant={this.props.context.state.activeRef?.current?.id}
                     aria-controls="mx_EmojiPicker_body"
                     aria-haspopup="grid"
                     aria-autocomplete="list"
@@ -89,4 +87,8 @@ class Search extends React.PureComponent<IProps> {
     }
 }
 
-export default Search;
+export default forwardRef<Search, Omit<IProps, "context">>((props, ref) => (
+    <RovingTabIndexContext.Consumer>
+        {(context) => <Search {...props} context={context} ref={ref} />}
+    </RovingTabIndexContext.Consumer>
+));
diff --git a/src/components/views/location/LocationPicker.tsx b/src/components/views/location/LocationPicker.tsx
index 2ddd19dfe3d..49d671d2de0 100644
--- a/src/components/views/location/LocationPicker.tsx
+++ b/src/components/views/location/LocationPicker.tsx
@@ -20,7 +20,7 @@ import { logger } from "matrix-js-sdk/src/logger";
 import { RoomMember, ClientEvent, IClientWellKnown } from "matrix-js-sdk/src/matrix";
 
 import { _t } from "../../../languageHandler";
-import MatrixClientContext from "../../../contexts/MatrixClientContext";
+import { MatrixClientProps, withMatrixClientHOC } from "../../../contexts/MatrixClientContext";
 import Modal from "../../../Modal";
 import { tileServerFromWellKnown } from "../../../utils/WellKnownUtils";
 import { GenericPosition, genericPositionFromGeolocation, getGeoUri } from "../../../utils/beacon";
@@ -32,7 +32,7 @@ import LiveDurationDropdown, { DEFAULT_DURATION_MS } from "./LiveDurationDropdow
 import { LocationShareType, ShareLocationFn } from "./shareLocation";
 import Marker from "./Marker";
 
-export interface ILocationPickerProps {
+export interface ILocationPickerProps extends MatrixClientProps {
     sender: RoomMember;
     shareType: LocationShareType;
     onChoose: ShareLocationFn;
@@ -49,8 +49,6 @@ const isSharingOwnLocation = (shareType: LocationShareType): boolean =>
     shareType === LocationShareType.Own || shareType === LocationShareType.Live;
 
 class LocationPicker extends React.Component<ILocationPickerProps, IState> {
-    public static contextType = MatrixClientContext;
-    public context!: React.ContextType<typeof MatrixClientContext>;
     private map?: maplibregl.Map;
     private geolocate?: maplibregl.GeolocateControl;
     private marker?: maplibregl.Marker;
@@ -70,12 +68,12 @@ class LocationPicker extends React.Component<ILocationPickerProps, IState> {
     };
 
     public componentDidMount(): void {
-        this.context.on(ClientEvent.ClientWellKnown, this.updateStyleUrl);
+        this.props.mxClient.on(ClientEvent.ClientWellKnown, this.updateStyleUrl);
 
         try {
             this.map = new maplibregl.Map({
                 container: "mx_LocationPicker_map",
-                style: findMapStyleUrl(this.context),
+                style: findMapStyleUrl(this.props.mxClient),
                 center: [0, 0],
                 zoom: 1,
             });
@@ -133,7 +131,7 @@ class LocationPicker extends React.Component<ILocationPickerProps, IState> {
         this.geolocate?.off("error", this.onGeolocateError);
         this.geolocate?.off("geolocate", this.onGeolocate);
         this.map?.off("click", this.onClick);
-        this.context.off(ClientEvent.ClientWellKnown, this.updateStyleUrl);
+        this.props.mxClient.off(ClientEvent.ClientWellKnown, this.updateStyleUrl);
     }
 
     private addMarkerToMap = (): void => {
@@ -270,4 +268,4 @@ class LocationPicker extends React.Component<ILocationPickerProps, IState> {
     }
 }
 
-export default LocationPicker;
+export default withMatrixClientHOC(LocationPicker);
diff --git a/src/components/views/location/LocationShareMenu.tsx b/src/components/views/location/LocationShareMenu.tsx
index 036e2e1fe08..3b81ff3fdd6 100644
--- a/src/components/views/location/LocationShareMenu.tsx
+++ b/src/components/views/location/LocationShareMenu.tsx
@@ -29,7 +29,7 @@ import { EnableLiveShare } from "./EnableLiveShare";
 import { useFeatureEnabled } from "../../../hooks/useSettings";
 import { SettingLevel } from "../../../settings/SettingLevel";
 
-type Props = Omit<ILocationPickerProps, "onChoose" | "shareType"> & {
+type Props = Omit<ILocationPickerProps, "onChoose" | "shareType" | "mxClient"> & {
     onFinished: (ev?: SyntheticEvent) => void;
     menuPosition: MenuProps;
     openMenu: () => void;
diff --git a/src/components/views/messages/CallEvent.tsx b/src/components/views/messages/CallEvent.tsx
index e37217c4224..ff3190f308f 100644
--- a/src/components/views/messages/CallEvent.tsx
+++ b/src/components/views/messages/CallEvent.tsx
@@ -163,7 +163,7 @@ interface CallEventProps {
 /**
  * An event tile representing an active or historical Element call.
  */
-export const CallEvent = forwardRef<any, CallEventProps>(({ mxEvent }, ref) => {
+export const CallEvent = forwardRef<HTMLDivElement, CallEventProps>(({ mxEvent }, ref) => {
     const client = useContext(MatrixClientContext);
     const call = useCall(mxEvent.getRoomId()!);
     const latestEvent = client
diff --git a/src/components/views/messages/EditHistoryMessage.tsx b/src/components/views/messages/EditHistoryMessage.tsx
index 49e0f1f7de4..39c4f77cb5b 100644
--- a/src/components/views/messages/EditHistoryMessage.tsx
+++ b/src/components/views/messages/EditHistoryMessage.tsx
@@ -30,14 +30,14 @@ import AccessibleButton from "../elements/AccessibleButton";
 import ConfirmAndWaitRedactDialog from "../dialogs/ConfirmAndWaitRedactDialog";
 import ViewSource from "../../structures/ViewSource";
 import SettingsStore from "../../../settings/SettingsStore";
-import MatrixClientContext from "../../../contexts/MatrixClientContext";
+import { MatrixClientProps, withMatrixClientHOC } from "../../../contexts/MatrixClientContext";
 
 function getReplacedContent(event: MatrixEvent): IContent {
     const originalContent = event.getOriginalContent();
     return originalContent["m.new_content"] || originalContent;
 }
 
-interface IProps {
+interface IProps extends MatrixClientProps {
     // the message event being edited
     mxEvent: MatrixEvent;
     previousEdit?: MatrixEvent;
@@ -50,19 +50,15 @@ interface IState {
     sendStatus: EventStatus | null;
 }
 
-export default class EditHistoryMessage extends React.PureComponent<IProps, IState> {
-    public static contextType = MatrixClientContext;
-    public context!: React.ContextType<typeof MatrixClientContext>;
-
+class EditHistoryMessage extends React.PureComponent<IProps, IState> {
     private content = createRef<HTMLDivElement>();
     private pills: Element[] = [];
     private tooltips: Element[] = [];
 
-    public constructor(props: IProps, context: React.ContextType<typeof MatrixClientContext>) {
+    public constructor(props: IProps) {
         super(props);
-        this.context = context;
 
-        const cli = this.context;
+        const cli = this.props.mxClient;
         const userId = cli.getSafeUserId();
         const event = this.props.mxEvent;
         const room = cli.getRoom(event.getRoomId());
@@ -77,7 +73,7 @@ export default class EditHistoryMessage extends React.PureComponent<IProps, ISta
 
     private onRedactClick = async (): Promise<void> => {
         const event = this.props.mxEvent;
-        const cli = this.context;
+        const cli = this.props.mxClient;
 
         Modal.createDialog(
             ConfirmAndWaitRedactDialog,
@@ -105,7 +101,7 @@ export default class EditHistoryMessage extends React.PureComponent<IProps, ISta
     private pillifyLinks(): void {
         // not present for redacted events
         if (this.content.current) {
-            pillifyLinks(this.context, this.content.current.children, this.props.mxEvent, this.pills);
+            pillifyLinks(this.props.mxClient, this.content.current.children, this.props.mxEvent, this.pills);
         }
     }
 
@@ -214,3 +210,5 @@ export default class EditHistoryMessage extends React.PureComponent<IProps, ISta
         );
     }
 }
+
+export default withMatrixClientHOC(EditHistoryMessage);
diff --git a/src/components/views/messages/IBodyProps.ts b/src/components/views/messages/IBodyProps.ts
index fcc204dae3b..54631f538bc 100644
--- a/src/components/views/messages/IBodyProps.ts
+++ b/src/components/views/messages/IBodyProps.ts
@@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, { LegacyRef } from "react";
 import { MatrixEvent } from "matrix-js-sdk/src/matrix";
 
 import { MediaEventHelper } from "../../../utils/MediaEventHelper";
@@ -54,8 +53,6 @@ export interface IBodyProps {
     // helper function to access relations for this event
     getRelationsForEvent?: GetRelationsForEvent;
 
-    ref?: React.RefObject<any> | LegacyRef<any>;
-
     // Set to `true` to disable interactions (e.g. video controls) and to remove controls from the tab order.
     // This may be useful when displaying a preview of the event.
     inhibitInteraction?: boolean;
diff --git a/src/components/views/messages/MAudioBody.tsx b/src/components/views/messages/MAudioBody.tsx
index de30b65f724..9bd613585f7 100644
--- a/src/components/views/messages/MAudioBody.tsx
+++ b/src/components/views/messages/MAudioBody.tsx
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from "react";
+import React, { forwardRef } from "react";
 import { logger } from "matrix-js-sdk/src/logger";
 import { IContent } from "matrix-js-sdk/src/matrix";
 import { MediaEventContent } from "matrix-js-sdk/src/types";
@@ -31,16 +31,17 @@ import { PlaybackQueue } from "../../../audio/PlaybackQueue";
 import RoomContext, { TimelineRenderingType } from "../../../contexts/RoomContext";
 import MediaProcessingError from "./shared/MediaProcessingError";
 
+interface Props extends IBodyProps {
+    context: React.ContextType<typeof RoomContext>;
+}
+
 interface IState {
     error?: boolean;
     playback?: Playback;
 }
 
-export default class MAudioBody extends React.PureComponent<IBodyProps, IState> {
-    public static contextType = RoomContext;
-    public context!: React.ContextType<typeof RoomContext>;
-
-    public constructor(props: IBodyProps) {
+export class MAudioBody extends React.PureComponent<Props, IState> {
+    public constructor(props: Props) {
         super(props);
 
         this.state = {};
@@ -88,9 +89,9 @@ export default class MAudioBody extends React.PureComponent<IBodyProps, IState>
 
     protected get showFileBody(): boolean {
         return (
-            this.context.timelineRenderingType !== TimelineRenderingType.Room &&
-            this.context.timelineRenderingType !== TimelineRenderingType.Pinned &&
-            this.context.timelineRenderingType !== TimelineRenderingType.Search
+            this.props.context.timelineRenderingType !== TimelineRenderingType.Room &&
+            this.props.context.timelineRenderingType !== TimelineRenderingType.Pinned &&
+            this.props.context.timelineRenderingType !== TimelineRenderingType.Search
         );
     }
 
@@ -131,3 +132,7 @@ export default class MAudioBody extends React.PureComponent<IBodyProps, IState>
         );
     }
 }
+
+export default forwardRef<MAudioBody, Omit<Props, "context">>((props, ref) => (
+    <RoomContext.Consumer>{(context) => <MAudioBody {...props} context={context} ref={ref} />}</RoomContext.Consumer>
+));
diff --git a/src/components/views/messages/MFileBody.tsx b/src/components/views/messages/MFileBody.tsx
index 12d4c804168..be113926587 100644
--- a/src/components/views/messages/MFileBody.tsx
+++ b/src/components/views/messages/MFileBody.tsx
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, { AllHTMLAttributes, createRef } from "react";
+import React, { AllHTMLAttributes, createRef, forwardRef } from "react";
 import { logger } from "matrix-js-sdk/src/logger";
 import { MediaEventContent } from "matrix-js-sdk/src/types";
 
@@ -97,17 +97,15 @@ export function computedStyle(element: HTMLElement | null): string {
 
 interface IProps extends IBodyProps {
     /* whether or not to show the default placeholder for the file. Defaults to true. */
-    showGenericPlaceholder: boolean;
+    showGenericPlaceholder?: boolean;
+    context: React.ContextType<typeof RoomContext>;
 }
 
 interface IState {
     decryptedBlob?: Blob;
 }
 
-export default class MFileBody extends React.Component<IProps, IState> {
-    public static contextType = RoomContext;
-    public context!: React.ContextType<typeof RoomContext>;
-
+class MFileBody extends React.Component<IProps, IState> {
     public static defaultProps = {
         showGenericPlaceholder: true,
     };
@@ -226,11 +224,11 @@ export default class MFileBody extends React.Component<IProps, IState> {
 
         let showDownloadLink =
             !this.props.showGenericPlaceholder ||
-            (this.context.timelineRenderingType !== TimelineRenderingType.Room &&
-                this.context.timelineRenderingType !== TimelineRenderingType.Search &&
-                this.context.timelineRenderingType !== TimelineRenderingType.Pinned);
+            (this.props.context.timelineRenderingType !== TimelineRenderingType.Room &&
+                this.props.context.timelineRenderingType !== TimelineRenderingType.Search &&
+                this.props.context.timelineRenderingType !== TimelineRenderingType.Pinned);
 
-        if (this.context.timelineRenderingType === TimelineRenderingType.Thread) {
+        if (this.props.context.timelineRenderingType === TimelineRenderingType.Thread) {
             showDownloadLink = false;
         }
 
@@ -348,7 +346,7 @@ export default class MFileBody extends React.Component<IProps, IState> {
                                 <span className="mx_MFileBody_download_icon" />
                                 {_t("timeline|m.file|download_label", { text: this.linkText })}
                             </a>
-                            {this.context.timelineRenderingType === TimelineRenderingType.File && (
+                            {this.props.context.timelineRenderingType === TimelineRenderingType.File && (
                                 <div className="mx_MImageBody_size">
                                     {this.content.info?.size ? fileSize(this.content.info.size) : ""}
                                 </div>
@@ -368,3 +366,7 @@ export default class MFileBody extends React.Component<IProps, IState> {
         }
     }
 }
+
+export default forwardRef<MFileBody, Omit<IProps, "context">>((props, ref) => (
+    <RoomContext.Consumer>{(context) => <MFileBody {...props} context={context} ref={ref} />}</RoomContext.Consumer>
+));
diff --git a/src/components/views/messages/MImageBody.tsx b/src/components/views/messages/MImageBody.tsx
index 36f3a851687..2191a2cea4d 100644
--- a/src/components/views/messages/MImageBody.tsx
+++ b/src/components/views/messages/MImageBody.tsx
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, { ComponentProps, createRef, ReactNode } from "react";
+import React, { ComponentProps, createRef, forwardRef, ReactNode } from "react";
 import { Blurhash } from "react-blurhash";
 import classNames from "classnames";
 import { CSSTransition, SwitchTransition } from "react-transition-group";
@@ -47,6 +47,10 @@ enum Placeholder {
     Blurhash,
 }
 
+interface Props extends IBodyProps {
+    context: React.ContextType<typeof RoomContext>;
+}
+
 interface IState {
     contentUrl: string | null;
     thumbUrl: string | null;
@@ -63,17 +67,14 @@ interface IState {
     placeholder: Placeholder;
 }
 
-export default class MImageBody extends React.Component<IBodyProps, IState> {
-    public static contextType = RoomContext;
-    public context!: React.ContextType<typeof RoomContext>;
-
+export class MImageBody extends React.Component<Props, IState> {
     private unmounted = true;
     private image = createRef<HTMLImageElement>();
     private timeout?: number;
     private sizeWatcher?: string;
     private reconnectedListener: ClientEventHandlerMap[ClientEvent.Sync];
 
-    public constructor(props: IBodyProps) {
+    public constructor(props: Props) {
         super(props);
 
         this.reconnectedListener = createReconnectedListener(this.clearError);
@@ -391,7 +392,9 @@ export default class MImageBody extends React.Component<IBodyProps, IState> {
     protected getBanner(content: ImageContent): ReactNode {
         // Hide it for the threads list & the file panel where we show it as text anyway.
         if (
-            [TimelineRenderingType.ThreadsList, TimelineRenderingType.File].includes(this.context.timelineRenderingType)
+            [TimelineRenderingType.ThreadsList, TimelineRenderingType.File].includes(
+                this.props.context.timelineRenderingType,
+            )
         ) {
             return null;
         }
@@ -601,11 +604,11 @@ export default class MImageBody extends React.Component<IBodyProps, IState> {
          * link as the message action bar will fulfill that
          */
         const hasMessageActionBar =
-            this.context.timelineRenderingType === TimelineRenderingType.Room ||
-            this.context.timelineRenderingType === TimelineRenderingType.Pinned ||
-            this.context.timelineRenderingType === TimelineRenderingType.Search ||
-            this.context.timelineRenderingType === TimelineRenderingType.Thread ||
-            this.context.timelineRenderingType === TimelineRenderingType.ThreadsList;
+            this.props.context.timelineRenderingType === TimelineRenderingType.Room ||
+            this.props.context.timelineRenderingType === TimelineRenderingType.Pinned ||
+            this.props.context.timelineRenderingType === TimelineRenderingType.Search ||
+            this.props.context.timelineRenderingType === TimelineRenderingType.Thread ||
+            this.props.context.timelineRenderingType === TimelineRenderingType.ThreadsList;
         if (!hasMessageActionBar) {
             return <MFileBody {...this.props} showGenericPlaceholder={false} />;
         }
@@ -648,6 +651,10 @@ export default class MImageBody extends React.Component<IBodyProps, IState> {
     }
 }
 
+export default forwardRef<MImageBody, Omit<Props, "context">>((props, ref) => (
+    <RoomContext.Consumer>{(context) => <MImageBody {...props} context={context} ref={ref} />}</RoomContext.Consumer>
+));
+
 interface PlaceholderIProps {
     hover?: boolean;
     maxWidth?: number;
diff --git a/src/components/views/messages/MImageReplyBody.tsx b/src/components/views/messages/MImageReplyBody.tsx
index ded0d374a80..bccb7178192 100644
--- a/src/components/views/messages/MImageReplyBody.tsx
+++ b/src/components/views/messages/MImageReplyBody.tsx
@@ -14,14 +14,20 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from "react";
+import React, { forwardRef } from "react";
 import { ImageContent } from "matrix-js-sdk/src/types";
 
-import MImageBody from "./MImageBody";
+import { MImageBody } from "./MImageBody";
+import { IBodyProps } from "./IBodyProps";
+import RoomContext from "../../../contexts/RoomContext";
 
 const FORCED_IMAGE_HEIGHT = 44;
 
-export default class MImageReplyBody extends MImageBody {
+interface Props extends IBodyProps {
+    context: React.ContextType<typeof RoomContext>;
+}
+
+class MImageReplyBody extends MImageBody {
     public onClick = (ev: React.MouseEvent): void => {
         ev.preventDefault();
     };
@@ -43,3 +49,9 @@ export default class MImageReplyBody extends MImageBody {
         return <div className="mx_MImageReplyBody">{thumbnail}</div>;
     }
 }
+
+export default forwardRef<MImageReplyBody, Omit<Props, "context">>((props, ref) => (
+    <RoomContext.Consumer>
+        {(context) => <MImageReplyBody {...props} context={context} ref={ref} />}
+    </RoomContext.Consumer>
+));
diff --git a/src/components/views/messages/MLocationBody.tsx b/src/components/views/messages/MLocationBody.tsx
index 29c1c97e1a5..d7df9c7827a 100644
--- a/src/components/views/messages/MLocationBody.tsx
+++ b/src/components/views/messages/MLocationBody.tsx
@@ -26,26 +26,25 @@ import {
     LocationShareError,
     isSelfLocation,
 } from "../../../utils/location";
-import MatrixClientContext from "../../../contexts/MatrixClientContext";
+import { MatrixClientProps, withMatrixClientHOC } from "../../../contexts/MatrixClientContext";
 import TooltipTarget from "../elements/TooltipTarget";
 import { Alignment } from "../elements/Tooltip";
 import { SmartMarker, Map, LocationViewDialog } from "../location";
 import { IBodyProps } from "./IBodyProps";
 import { createReconnectedListener } from "../../../utils/connection";
 
+interface Props extends IBodyProps, MatrixClientProps {}
+
 interface IState {
     error?: Error;
 }
 
-export default class MLocationBody extends React.Component<IBodyProps, IState> {
-    public static contextType = MatrixClientContext;
-    public context!: React.ContextType<typeof MatrixClientContext>;
-
+class MLocationBody extends React.Component<Props, IState> {
     private unmounted = false;
     private mapId: string;
     private reconnectedListener: ClientEventHandlerMap[ClientEvent.Sync];
 
-    public constructor(props: IBodyProps) {
+    public constructor(props: Props) {
         super(props);
 
         // multiple instances of same map might be in document
@@ -62,7 +61,7 @@ export default class MLocationBody extends React.Component<IBodyProps, IState> {
         Modal.createDialog(
             LocationViewDialog,
             {
-                matrixClient: this.context,
+                matrixClient: this.props.mxClient,
                 mxEvent: this.props.mxEvent,
             },
             "mx_LocationViewDialog_wrapper",
@@ -72,7 +71,7 @@ export default class MLocationBody extends React.Component<IBodyProps, IState> {
     };
 
     private clearError = (): void => {
-        this.context.off(ClientEvent.Sync, this.reconnectedListener);
+        this.props.mxClient.off(ClientEvent.Sync, this.reconnectedListener);
         this.setState({ error: undefined });
     };
 
@@ -80,13 +79,13 @@ export default class MLocationBody extends React.Component<IBodyProps, IState> {
         if (this.unmounted) return;
         this.setState({ error });
         // Unregister first in case we already had it registered
-        this.context.off(ClientEvent.Sync, this.reconnectedListener);
-        this.context.on(ClientEvent.Sync, this.reconnectedListener);
+        this.props.mxClient.off(ClientEvent.Sync, this.reconnectedListener);
+        this.props.mxClient.on(ClientEvent.Sync, this.reconnectedListener);
     };
 
     public componentWillUnmount(): void {
         this.unmounted = true;
-        this.context.off(ClientEvent.Sync, this.reconnectedListener);
+        this.props.mxClient.off(ClientEvent.Sync, this.reconnectedListener);
     }
 
     public render(): React.ReactElement<HTMLDivElement> {
@@ -104,6 +103,8 @@ export default class MLocationBody extends React.Component<IBodyProps, IState> {
     }
 }
 
+export default withMatrixClientHOC(MLocationBody);
+
 export const LocationBodyFallbackContent: React.FC<{ event: MatrixEvent; error: Error }> = ({ error, event }) => {
     const errorType = error?.message as LocationShareError;
     const message = `${_t("location_sharing|failed_load_map")}: ${getLocationShareErrorMessage(errorType)}`;
diff --git a/src/components/views/messages/MPollBody.tsx b/src/components/views/messages/MPollBody.tsx
index d777ed9d779..fb0536df277 100644
--- a/src/components/views/messages/MPollBody.tsx
+++ b/src/components/views/messages/MPollBody.tsx
@@ -35,7 +35,7 @@ import { _t } from "../../../languageHandler";
 import Modal from "../../../Modal";
 import { IBodyProps } from "./IBodyProps";
 import { formatList } from "../../../utils/FormattingUtils";
-import MatrixClientContext from "../../../contexts/MatrixClientContext";
+import { MatrixClientProps, withMatrixClientHOC } from "../../../contexts/MatrixClientContext";
 import ErrorDialog from "../dialogs/ErrorDialog";
 import { GetRelationsForEvent } from "../rooms/EventTile";
 import PollCreateDialog from "../elements/PollCreateDialog";
@@ -43,6 +43,8 @@ import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import Spinner from "../elements/Spinner";
 import { PollOption } from "../polls/PollOption";
 
+interface Props extends IBodyProps, MatrixClientProps {}
+
 interface IState {
     poll?: Poll;
     // poll instance has fetched at least one page of responses
@@ -145,12 +147,10 @@ export function launchPollEditor(mxEvent: MatrixEvent, getRelationsForEvent?: Ge
     }
 }
 
-export default class MPollBody extends React.Component<IBodyProps, IState> {
-    public static contextType = MatrixClientContext;
-    public context!: React.ContextType<typeof MatrixClientContext>;
+class MPollBody extends React.Component<Props, IState> {
     private seenEventIds: string[] = []; // Events we have already seen
 
-    public constructor(props: IBodyProps) {
+    public constructor(props: Props) {
         super(props);
 
         this.state = {
@@ -160,7 +160,7 @@ export default class MPollBody extends React.Component<IBodyProps, IState> {
     }
 
     public componentDidMount(): void {
-        const room = this.context?.getRoom(this.props.mxEvent.getRoomId());
+        const room = this.props.mxClient?.getRoom(this.props.mxEvent.getRoomId());
         const poll = room?.polls.get(this.props.mxEvent.getId()!);
         if (poll) {
             this.setPollInstance(poll);
@@ -218,7 +218,7 @@ export default class MPollBody extends React.Component<IBodyProps, IState> {
             return;
         }
         const userVotes = this.collectUserVotes();
-        const userId = this.context.getSafeUserId();
+        const userId = this.props.mxClient.getSafeUserId();
         const myVote = userVotes.get(userId)?.answers[0];
         if (answerId === myVote) {
             return;
@@ -226,7 +226,7 @@ export default class MPollBody extends React.Component<IBodyProps, IState> {
 
         const response = PollResponseEvent.from([answerId], this.props.mxEvent.getId()!).serialize();
 
-        this.context
+        this.props.mxClient
             .sendEvent(
                 this.props.mxEvent.getRoomId()!,
                 response.type as keyof TimelineEvents,
@@ -248,10 +248,14 @@ export default class MPollBody extends React.Component<IBodyProps, IState> {
      * @returns userId -> UserVote
      */
     private collectUserVotes(): Map<string, UserVote> {
-        if (!this.state.voteRelations || !this.context) {
+        if (!this.state.voteRelations || !this.props.mxClient) {
             return new Map<string, UserVote>();
         }
-        return collectUserVotes(allVotes(this.state.voteRelations), this.context.getUserId(), this.state.selected);
+        return collectUserVotes(
+            allVotes(this.state.voteRelations),
+            this.props.mxClient.getUserId(),
+            this.state.selected,
+        );
     }
 
     /**
@@ -271,7 +275,7 @@ export default class MPollBody extends React.Component<IBodyProps, IState> {
 
         if (newEvents.length > 0) {
             for (const mxEvent of newEvents) {
-                if (mxEvent.getSender() === this.context.getUserId()) {
+                if (mxEvent.getSender() === this.props.mxClient.getUserId()) {
                     newSelected = null;
                 }
             }
@@ -303,7 +307,7 @@ export default class MPollBody extends React.Component<IBodyProps, IState> {
         const votes = countVotes(userVotes, pollEvent);
         const totalVotes = this.totalVotes(votes);
         const winCount = Math.max(...votes.values());
-        const userId = this.context.getSafeUserId();
+        const userId = this.props.mxClient.getSafeUserId();
         const myVote = userVotes?.get(userId)?.answers[0];
         const disclosed = M_POLL_KIND_DISCLOSED.matches(pollEvent.kind.name);
 
@@ -372,6 +376,9 @@ export default class MPollBody extends React.Component<IBodyProps, IState> {
         );
     }
 }
+
+export default withMatrixClientHOC(MPollBody);
+
 export class UserVote {
     public constructor(
         public readonly ts: number,
diff --git a/src/components/views/messages/MStickerBody.tsx b/src/components/views/messages/MStickerBody.tsx
index 073da22b2a1..f5d46f8037c 100644
--- a/src/components/views/messages/MStickerBody.tsx
+++ b/src/components/views/messages/MStickerBody.tsx
@@ -14,14 +14,20 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, { ComponentProps, ReactNode } from "react";
+import React, { ComponentProps, forwardRef, ReactNode } from "react";
 import { Tooltip } from "@vector-im/compound-web";
 import { MediaEventContent } from "matrix-js-sdk/src/types";
 
-import MImageBody from "./MImageBody";
+import { MImageBody } from "./MImageBody";
 import { BLURHASH_FIELD } from "../../../utils/image-media";
+import RoomContext from "../../../contexts/RoomContext";
+import { IBodyProps } from "./IBodyProps";
 
-export default class MStickerBody extends MImageBody {
+interface Props extends IBodyProps {
+    context: React.ContextType<typeof RoomContext>;
+}
+
+class MStickerBody extends MImageBody {
     // Mostly empty to prevent default behaviour of MImageBody
     protected onClick = (ev: React.MouseEvent): void => {
         ev.preventDefault();
@@ -83,3 +89,7 @@ export default class MStickerBody extends MImageBody {
         return null; // we don't need a banner, we have a tooltip
     }
 }
+
+export default forwardRef<MStickerBody, Omit<Props, "context">>((props, ref) => (
+    <RoomContext.Consumer>{(context) => <MStickerBody {...props} context={context} ref={ref} />}</RoomContext.Consumer>
+));
diff --git a/src/components/views/messages/MVideoBody.tsx b/src/components/views/messages/MVideoBody.tsx
index be6ae4442ce..a68e3b1907b 100644
--- a/src/components/views/messages/MVideoBody.tsx
+++ b/src/components/views/messages/MVideoBody.tsx
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, { ReactNode } from "react";
+import React, { forwardRef, ReactNode } from "react";
 import { decode } from "blurhash";
 import { MediaEventContent } from "matrix-js-sdk/src/types";
 import { logger } from "matrix-js-sdk/src/logger";
@@ -30,6 +30,10 @@ import { ImageSize, suggestedSize as suggestedVideoSize } from "../../../setting
 import RoomContext, { TimelineRenderingType } from "../../../contexts/RoomContext";
 import MediaProcessingError from "./shared/MediaProcessingError";
 
+interface Props extends IBodyProps {
+    context: React.ContextType<typeof RoomContext>;
+}
+
 interface IState {
     decryptedUrl: string | null;
     decryptedThumbnailUrl: string | null;
@@ -40,14 +44,11 @@ interface IState {
     blurhashUrl: string | null;
 }
 
-export default class MVideoBody extends React.PureComponent<IBodyProps, IState> {
-    public static contextType = RoomContext;
-    public context!: React.ContextType<typeof RoomContext>;
-
+class MVideoBody extends React.PureComponent<Props, IState> {
     private videoRef = React.createRef<HTMLVideoElement>();
     private sizeWatcher?: string;
 
-    public constructor(props: IBodyProps) {
+    public constructor(props: Props) {
         super(props);
 
         this.state = {
@@ -221,9 +222,9 @@ export default class MVideoBody extends React.PureComponent<IBodyProps, IState>
 
     protected get showFileBody(): boolean {
         return (
-            this.context.timelineRenderingType !== TimelineRenderingType.Room &&
-            this.context.timelineRenderingType !== TimelineRenderingType.Pinned &&
-            this.context.timelineRenderingType !== TimelineRenderingType.Search
+            this.props.context.timelineRenderingType !== TimelineRenderingType.Room &&
+            this.props.context.timelineRenderingType !== TimelineRenderingType.Pinned &&
+            this.props.context.timelineRenderingType !== TimelineRenderingType.Search
         );
     }
 
@@ -306,3 +307,7 @@ export default class MVideoBody extends React.PureComponent<IBodyProps, IState>
         );
     }
 }
+
+export default forwardRef<MVideoBody, Omit<Props, "context">>((props, ref) => (
+    <RoomContext.Consumer>{(context) => <MVideoBody {...props} context={context} ref={ref} />}</RoomContext.Consumer>
+));
diff --git a/src/components/views/messages/MVoiceMessageBody.tsx b/src/components/views/messages/MVoiceMessageBody.tsx
index 096824e4b23..10fb5c810cd 100644
--- a/src/components/views/messages/MVoiceMessageBody.tsx
+++ b/src/components/views/messages/MVoiceMessageBody.tsx
@@ -14,16 +14,22 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from "react";
+import React, { forwardRef } from "react";
 
 import InlineSpinner from "../elements/InlineSpinner";
 import { _t } from "../../../languageHandler";
 import RecordingPlayback from "../audio_messages/RecordingPlayback";
-import MAudioBody from "./MAudioBody";
+import { MAudioBody } from "./MAudioBody";
 import MFileBody from "./MFileBody";
 import MediaProcessingError from "./shared/MediaProcessingError";
+import { IBodyProps } from "./IBodyProps";
+import RoomContext from "../../../contexts/RoomContext";
 
-export default class MVoiceMessageBody extends MAudioBody {
+interface Props extends IBodyProps {
+    context: React.ContextType<typeof RoomContext>;
+}
+
+class MVoiceMessageBody extends MAudioBody {
     // A voice message is an audio file but rendered in a special way.
     public render(): React.ReactNode {
         if (this.state.error) {
@@ -51,3 +57,9 @@ export default class MVoiceMessageBody extends MAudioBody {
         );
     }
 }
+
+export default forwardRef<MVoiceMessageBody, Omit<Props, "context">>((props, ref) => (
+    <RoomContext.Consumer>
+        {(context) => <MVoiceMessageBody {...props} context={context} ref={ref} />}
+    </RoomContext.Consumer>
+));
diff --git a/src/components/views/messages/MessageActionBar.tsx b/src/components/views/messages/MessageActionBar.tsx
index 87b5cb79c49..b5109ee0016 100644
--- a/src/components/views/messages/MessageActionBar.tsx
+++ b/src/components/views/messages/MessageActionBar.tsx
@@ -16,7 +16,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, { ReactElement, useCallback, useContext, useEffect } from "react";
+import React, { forwardRef, ReactElement, useCallback, useContext, useEffect } from "react";
 import {
     EventStatus,
     MatrixEvent,
@@ -255,11 +255,10 @@ interface IMessageActionBarProps {
     toggleThreadExpanded: () => void;
     isQuoteExpanded?: boolean;
     getRelationsForEvent?: GetRelationsForEvent;
+    context: React.ContextType<typeof RoomContext>;
 }
 
-export default class MessageActionBar extends React.PureComponent<IMessageActionBarProps> {
-    public static contextType = RoomContext;
-
+class MessageActionBar extends React.PureComponent<IMessageActionBarProps> {
     public componentDidMount(): void {
         if (this.props.mxEvent.status && this.props.mxEvent.status !== EventStatus.SENT) {
             this.props.mxEvent.on(MatrixEventEvent.Status, this.onSent);
@@ -308,7 +307,7 @@ export default class MessageActionBar extends React.PureComponent<IMessageAction
         dis.dispatch({
             action: "reply_to_event",
             event: this.props.mxEvent,
-            context: this.context.timelineRenderingType,
+            context: this.props.context.timelineRenderingType,
         });
     };
 
@@ -320,7 +319,7 @@ export default class MessageActionBar extends React.PureComponent<IMessageAction
         editEvent(
             MatrixClientPeg.safeGet(),
             this.props.mxEvent,
-            this.context.timelineRenderingType,
+            this.props.context.timelineRenderingType,
             this.props.getRelationsForEvent,
         );
     };
@@ -328,7 +327,7 @@ export default class MessageActionBar extends React.PureComponent<IMessageAction
     private readonly forbiddenThreadHeadMsgType = [MsgType.KeyVerificationRequest];
 
     private get showReplyInThreadAction(): boolean {
-        const inNotThreadTimeline = this.context.timelineRenderingType !== TimelineRenderingType.Thread;
+        const inNotThreadTimeline = this.props.context.timelineRenderingType !== TimelineRenderingType.Thread;
 
         const isAllowedMessageType =
             !this.forbiddenThreadHeadMsgType.includes(this.props.mxEvent.getContent().msgtype as MsgType) &&
@@ -442,7 +441,7 @@ export default class MessageActionBar extends React.PureComponent<IMessageAction
                 // The only catch is we do the reply button first so that we can make sure the react
                 // button is the very first button without having to do length checks for `splice()`.
 
-                if (this.context.canSendMessages) {
+                if (this.props.context.canSendMessages) {
                     if (this.showReplyInThreadAction) {
                         toolbarOpts.splice(0, 0, threadTooltipButton);
                     }
@@ -461,7 +460,7 @@ export default class MessageActionBar extends React.PureComponent<IMessageAction
                     );
                 }
                 // We hide the react button in search results as we don't show reactions in results
-                if (this.context.canReact && !this.context.search) {
+                if (this.props.context.canReact && !this.props.context.search) {
                     toolbarOpts.splice(
                         0,
                         0,
@@ -488,7 +487,7 @@ export default class MessageActionBar extends React.PureComponent<IMessageAction
                 }
             } else if (
                 // Show thread icon even for deleted messages, but only within main timeline
-                this.context.timelineRenderingType === TimelineRenderingType.Room &&
+                this.props.context.timelineRenderingType === TimelineRenderingType.Room &&
                 this.props.mxEvent.getThread()
             ) {
                 toolbarOpts.unshift(threadTooltipButton);
@@ -544,3 +543,9 @@ export default class MessageActionBar extends React.PureComponent<IMessageAction
         );
     }
 }
+
+export default forwardRef<MessageActionBar, Omit<IMessageActionBarProps, "context">>((props, ref) => (
+    <RoomContext.Consumer>
+        {(context) => <MessageActionBar {...props} context={context} ref={ref} />}
+    </RoomContext.Consumer>
+));
diff --git a/src/components/views/messages/MessageEvent.tsx b/src/components/views/messages/MessageEvent.tsx
index db0016de7b0..bd37ae7cafe 100644
--- a/src/components/views/messages/MessageEvent.tsx
+++ b/src/components/views/messages/MessageEvent.tsx
@@ -32,7 +32,6 @@ import UnknownBody from "./UnknownBody";
 import { IMediaBody } from "./IMediaBody";
 import { MediaEventHelper } from "../../../utils/MediaEventHelper";
 import { IBodyProps } from "./IBodyProps";
-import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import TextualBody from "./TextualBody";
 import MImageBody from "./MImageBody";
 import MFileBody from "./MFileBody";
@@ -51,8 +50,8 @@ import { VoiceBroadcastBody, VoiceBroadcastInfoEventType, VoiceBroadcastInfoStat
 // onMessageAllowed is handled internally
 interface IProps extends Omit<IBodyProps, "onMessageAllowed" | "mediaEventHelper"> {
     /* overrides for the msgtype-specific components, used by ReplyTile to override file rendering */
-    overrideBodyTypes?: Record<string, typeof React.Component>;
-    overrideEventTypes?: Record<string, typeof React.Component>;
+    overrideBodyTypes?: Record<string, ComponentType>;
+    overrideEventTypes?: Record<string, ComponentType>;
 
     // helper function to access relations for this event
     getRelationsForEvent?: GetRelationsForEvent;
@@ -64,7 +63,9 @@ export interface IOperableEventTile {
     getEventTileOps(): IEventTileOps | null;
 }
 
-const baseBodyTypes = new Map<string, typeof React.Component>([
+type ComponentType = React.ComponentType<IBodyProps & React.RefAttributes<any>>;
+
+const baseBodyTypes = new Map<string, ComponentType>([
     [MsgType.Text, TextualBody],
     [MsgType.Notice, TextualBody],
     [MsgType.Emote, TextualBody],
@@ -73,7 +74,7 @@ const baseBodyTypes = new Map<string, typeof React.Component>([
     [MsgType.Audio, MVoiceOrAudioBody],
     [MsgType.Video, MVideoBody],
 ]);
-const baseEvTypes = new Map<string, React.ComponentType<IBodyProps>>([
+const baseEvTypes = new Map<string, ComponentType>([
     [EventType.Sticker, MStickerBody],
     [M_POLL_START.name, MPollBody],
     [M_POLL_START.altName, MPollBody],
@@ -84,16 +85,13 @@ const baseEvTypes = new Map<string, React.ComponentType<IBodyProps>>([
 ]);
 
 export default class MessageEvent extends React.Component<IProps> implements IMediaBody, IOperableEventTile {
-    private body: React.RefObject<React.Component | IOperableEventTile> = createRef();
+    private body: React.RefObject<ComponentType | IOperableEventTile> = createRef();
     private mediaHelper?: MediaEventHelper;
-    private bodyTypes = new Map<string, typeof React.Component>(baseBodyTypes.entries());
-    private evTypes = new Map<string, React.ComponentType<IBodyProps>>(baseEvTypes.entries());
-
-    public static contextType = MatrixClientContext;
-    public context!: React.ContextType<typeof MatrixClientContext>;
+    private bodyTypes = new Map<string, ComponentType>(baseBodyTypes.entries());
+    private evTypes = new Map<string, ComponentType>(baseEvTypes.entries());
 
-    public constructor(props: IProps, context: React.ContextType<typeof MatrixClientContext>) {
-        super(props, context);
+    public constructor(props: IProps) {
+        super(props);
 
         if (MediaEventHelper.isEligible(this.props.mxEvent)) {
             this.mediaHelper = new MediaEventHelper(this.props.mxEvent);
@@ -121,12 +119,12 @@ export default class MessageEvent extends React.Component<IProps> implements IMe
     }
 
     private updateComponentMaps(): void {
-        this.bodyTypes = new Map<string, typeof React.Component>(baseBodyTypes.entries());
+        this.bodyTypes = new Map<string, ComponentType>(baseBodyTypes.entries());
         for (const [bodyType, bodyComponent] of Object.entries(this.props.overrideBodyTypes ?? {})) {
             this.bodyTypes.set(bodyType, bodyComponent);
         }
 
-        this.evTypes = new Map<string, React.ComponentType<IBodyProps>>(baseEvTypes.entries());
+        this.evTypes = new Map<string, ComponentType>(baseEvTypes.entries());
         for (const [evType, evComponent] of Object.entries(this.props.overrideEventTypes ?? {})) {
             this.evTypes.set(evType, evComponent);
         }
@@ -156,7 +154,7 @@ export default class MessageEvent extends React.Component<IProps> implements IMe
         const content = this.props.mxEvent.getContent();
         const type = this.props.mxEvent.getType();
         const msgtype = content.msgtype;
-        let BodyType: React.ComponentType<IBodyProps> = RedactedBody;
+        let BodyType: ComponentType = RedactedBody;
         if (!this.props.mxEvent.isRedacted()) {
             // only resolve BodyType if event is not redacted
             if (this.props.mxEvent.isDecryptionFailure()) {
diff --git a/src/components/views/messages/ReactionsRow.tsx b/src/components/views/messages/ReactionsRow.tsx
index e57326edd73..fcf748bd6a9 100644
--- a/src/components/views/messages/ReactionsRow.tsx
+++ b/src/components/views/messages/ReactionsRow.tsx
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, { SyntheticEvent } from "react";
+import React, { forwardRef, SyntheticEvent } from "react";
 import classNames from "classnames";
 import { MatrixEvent, MatrixEventEvent, Relations, RelationsEvent } from "matrix-js-sdk/src/matrix";
 import { uniqBy } from "lodash";
@@ -35,7 +35,7 @@ const MAX_ITEMS_WHEN_LIMITED = 8;
 
 export const REACTION_SHORTCODE_KEY = new UnstableValue("shortcode", "com.beeper.reaction.shortcode");
 
-const ReactButton: React.FC<IProps> = ({ mxEvent, reactions }) => {
+const ReactButton: React.FC<Omit<IProps, "context">> = ({ mxEvent, reactions }) => {
     const [menuDisplayed, button, openMenu, closeMenu] = useContextMenu();
 
     let contextMenu: JSX.Element | undefined;
@@ -74,6 +74,7 @@ interface IProps {
     mxEvent: MatrixEvent;
     // The Relations model from the JS SDK for reactions to `mxEvent`
     reactions?: Relations | null | undefined;
+    context: React.ContextType<typeof RoomContext>;
 }
 
 interface IState {
@@ -81,13 +82,9 @@ interface IState {
     showAll: boolean;
 }
 
-export default class ReactionsRow extends React.PureComponent<IProps, IState> {
-    public static contextType = RoomContext;
-    public context!: React.ContextType<typeof RoomContext>;
-
-    public constructor(props: IProps, context: React.ContextType<typeof RoomContext>) {
-        super(props, context);
-        this.context = context;
+class ReactionsRow extends React.PureComponent<IProps, IState> {
+    public constructor(props: IProps) {
+        super(props);
 
         this.state = {
             myReactions: this.getMyReactions(),
@@ -151,7 +148,7 @@ export default class ReactionsRow extends React.PureComponent<IProps, IState> {
         if (!reactions) {
             return null;
         }
-        const userId = this.context.room?.client.getUserId();
+        const userId = this.props.context.room?.client.getUserId();
         if (!userId) return null;
         const myReactions = reactions.getAnnotationsBySender()?.[userId];
         if (!myReactions) {
@@ -202,8 +199,8 @@ export default class ReactionsRow extends React.PureComponent<IProps, IState> {
                         myReactionEvent={myReactionEvent}
                         customReactionImagesEnabled={customReactionImagesEnabled}
                         disabled={
-                            !this.context.canReact ||
-                            (myReactionEvent && !myReactionEvent.isRedacted() && !this.context.canSelfRedact)
+                            !this.props.context.canReact ||
+                            (myReactionEvent && !myReactionEvent.isRedacted() && !this.props.context.canSelfRedact)
                         }
                     />
                 );
@@ -226,7 +223,7 @@ export default class ReactionsRow extends React.PureComponent<IProps, IState> {
         }
 
         let addReactionButton: JSX.Element | undefined;
-        if (this.context.canReact) {
+        if (this.props.context.canReact) {
             addReactionButton = <ReactButton mxEvent={mxEvent} reactions={reactions} />;
         }
 
@@ -239,3 +236,7 @@ export default class ReactionsRow extends React.PureComponent<IProps, IState> {
         );
     }
 }
+
+export default forwardRef<ReactionsRow, Omit<IProps, "context">>((props, ref) => (
+    <RoomContext.Consumer>{(context) => <ReactionsRow {...props} context={context} ref={ref} />}</RoomContext.Consumer>
+));
diff --git a/src/components/views/messages/ReactionsRowButton.tsx b/src/components/views/messages/ReactionsRowButton.tsx
index 2737212d33b..9f60bde5ea9 100644
--- a/src/components/views/messages/ReactionsRowButton.tsx
+++ b/src/components/views/messages/ReactionsRowButton.tsx
@@ -24,10 +24,10 @@ import { formatList } from "../../../utils/FormattingUtils";
 import dis from "../../../dispatcher/dispatcher";
 import ReactionsRowButtonTooltip from "./ReactionsRowButtonTooltip";
 import AccessibleButton from "../elements/AccessibleButton";
-import MatrixClientContext from "../../../contexts/MatrixClientContext";
+import { MatrixClientProps, withMatrixClientHOC } from "../../../contexts/MatrixClientContext";
 import { REACTION_SHORTCODE_KEY } from "./ReactionsRow";
 
-export interface IProps {
+interface IProps extends MatrixClientProps {
     // The event we're displaying reactions for
     mxEvent: MatrixEvent;
     // The reaction content / key / emoji
@@ -49,10 +49,7 @@ interface IState {
     tooltipVisible: boolean;
 }
 
-export default class ReactionsRowButton extends React.PureComponent<IProps, IState> {
-    public static contextType = MatrixClientContext;
-    public context!: React.ContextType<typeof MatrixClientContext>;
-
+class ReactionsRowButton extends React.PureComponent<IProps, IState> {
     public state = {
         tooltipRendered: false,
         tooltipVisible: false,
@@ -61,9 +58,9 @@ export default class ReactionsRowButton extends React.PureComponent<IProps, ISta
     public onClick = (): void => {
         const { mxEvent, myReactionEvent, content } = this.props;
         if (myReactionEvent) {
-            this.context.redactEvent(mxEvent.getRoomId()!, myReactionEvent.getId()!);
+            this.props.mxClient.redactEvent(mxEvent.getRoomId()!, myReactionEvent.getId()!);
         } else {
-            this.context.sendEvent(mxEvent.getRoomId()!, EventType.Reaction, {
+            this.props.mxClient.sendEvent(mxEvent.getRoomId()!, EventType.Reaction, {
                 "m.relates_to": {
                     rel_type: RelationType.Annotation,
                     event_id: mxEvent.getId()!,
@@ -110,7 +107,7 @@ export default class ReactionsRowButton extends React.PureComponent<IProps, ISta
             );
         }
 
-        const room = this.context.getRoom(mxEvent.getRoomId());
+        const room = this.props.mxClient.getRoom(mxEvent.getRoomId());
         let label: string | undefined;
         let customReactionName: string | undefined;
         if (room) {
@@ -173,3 +170,5 @@ export default class ReactionsRowButton extends React.PureComponent<IProps, ISta
         );
     }
 }
+
+export default withMatrixClientHOC(ReactionsRowButton);
diff --git a/src/components/views/messages/ReactionsRowButtonTooltip.tsx b/src/components/views/messages/ReactionsRowButtonTooltip.tsx
index f2a3d26109e..9013785d263 100644
--- a/src/components/views/messages/ReactionsRowButtonTooltip.tsx
+++ b/src/components/views/messages/ReactionsRowButtonTooltip.tsx
@@ -21,9 +21,10 @@ import { unicodeToShortcode } from "../../../HtmlUtils";
 import { _t } from "../../../languageHandler";
 import { formatList } from "../../../utils/FormattingUtils";
 import Tooltip from "../elements/Tooltip";
-import MatrixClientContext from "../../../contexts/MatrixClientContext";
+import { MatrixClientProps, withMatrixClientHOC } from "../../../contexts/MatrixClientContext";
 import { REACTION_SHORTCODE_KEY } from "./ReactionsRow";
-interface IProps {
+
+interface IProps extends MatrixClientProps {
     // The event we're displaying reactions for
     mxEvent: MatrixEvent;
     // The reaction content / key / emoji
@@ -35,14 +36,11 @@ interface IProps {
     customReactionImagesEnabled?: boolean;
 }
 
-export default class ReactionsRowButtonTooltip extends React.PureComponent<IProps> {
-    public static contextType = MatrixClientContext;
-    public context!: React.ContextType<typeof MatrixClientContext>;
-
+class ReactionsRowButtonTooltip extends React.PureComponent<IProps> {
     public render(): React.ReactNode {
         const { content, reactionEvents, mxEvent, visible } = this.props;
 
-        const room = this.context.getRoom(mxEvent.getRoomId());
+        const room = this.props.mxClient.getRoom(mxEvent.getRoomId());
         let tooltipLabel: JSX.Element | undefined;
         if (room) {
             const senders: string[] = [];
@@ -88,3 +86,5 @@ export default class ReactionsRowButtonTooltip extends React.PureComponent<IProp
         return tooltip;
     }
 }
+
+export default withMatrixClientHOC(ReactionsRowButtonTooltip);
diff --git a/src/components/views/messages/TextualBody.tsx b/src/components/views/messages/TextualBody.tsx
index f0b5c70f17d..69ee45c91b2 100644
--- a/src/components/views/messages/TextualBody.tsx
+++ b/src/components/views/messages/TextualBody.tsx
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, { createRef, SyntheticEvent, MouseEvent } from "react";
+import React, { createRef, SyntheticEvent, MouseEvent, forwardRef } from "react";
 import ReactDOM from "react-dom";
 import { MsgType } from "matrix-js-sdk/src/matrix";
 
@@ -51,6 +51,10 @@ import { MatrixClientPeg } from "../../../MatrixClientPeg";
 
 const MAX_HIGHLIGHT_LENGTH = 4096;
 
+interface Props extends IBodyProps {
+    context: React.ContextType<typeof RoomContext>;
+}
+
 interface IState {
     // the URLs (if any) to be previewed with a LinkPreviewWidget inside this TextualBody.
     links: string[];
@@ -59,17 +63,14 @@ interface IState {
     widgetHidden: boolean;
 }
 
-export default class TextualBody extends React.Component<IBodyProps, IState> {
+class TextualBody extends React.Component<Props, IState> {
     private readonly contentRef = createRef<HTMLSpanElement>();
 
     private unmounted = false;
     private pills: Element[] = [];
     private tooltips: Element[] = [];
 
-    public static contextType = RoomContext;
-    public context!: React.ContextType<typeof RoomContext>;
-
-    public constructor(props: IBodyProps) {
+    public constructor(props: Props) {
         super(props);
 
         this.state = {
@@ -429,7 +430,7 @@ export default class TextualBody extends React.Component<IBodyProps, IState> {
         dis.dispatch({
             action: Action.ComposerInsert,
             userId: mxEvent.getSender(),
-            timelineRenderingType: this.context.timelineRenderingType,
+            timelineRenderingType: this.props.context.timelineRenderingType,
         });
     };
 
@@ -659,3 +660,7 @@ export default class TextualBody extends React.Component<IBodyProps, IState> {
         );
     }
 }
+
+export default forwardRef<TextualBody, Omit<Props, "context">>((props, ref) => (
+    <RoomContext.Consumer>{(context) => <TextualBody {...props} context={context} ref={ref} />}</RoomContext.Consumer>
+));
diff --git a/src/components/views/messages/TextualEvent.tsx b/src/components/views/messages/TextualEvent.tsx
index ae94fd31f9e..b49f64a475f 100644
--- a/src/components/views/messages/TextualEvent.tsx
+++ b/src/components/views/messages/TextualEvent.tsx
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from "react";
+import React, { forwardRef } from "react";
 import { MatrixEvent } from "matrix-js-sdk/src/matrix";
 
 import RoomContext from "../../../contexts/RoomContext";
@@ -23,19 +23,22 @@ import { MatrixClientPeg } from "../../../MatrixClientPeg";
 
 interface IProps {
     mxEvent: MatrixEvent;
+    context: React.ContextType<typeof RoomContext>;
 }
 
-export default class TextualEvent extends React.Component<IProps> {
-    public static contextType = RoomContext;
-
+class TextualEvent extends React.Component<IProps> {
     public render(): React.ReactNode {
         const text = TextForEvent.textForEvent(
             this.props.mxEvent,
             MatrixClientPeg.safeGet(),
             true,
-            this.context?.showHiddenEvents,
+            this.props.context?.showHiddenEvents,
         );
         if (!text) return null;
         return <div className="mx_TextualEvent">{text}</div>;
     }
 }
+
+export default forwardRef<TextualEvent, Omit<IProps, "context">>((props, ref) => (
+    <RoomContext.Consumer>{(context) => <TextualEvent {...props} context={context} ref={ref} />}</RoomContext.Consumer>
+));
diff --git a/src/components/views/right_panel/TimelineCard.tsx b/src/components/views/right_panel/TimelineCard.tsx
index 7dfcd633070..9b1bf339480 100644
--- a/src/components/views/right_panel/TimelineCard.tsx
+++ b/src/components/views/right_panel/TimelineCard.tsx
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from "react";
+import React, { forwardRef } from "react";
 import {
     IEventRelation,
     MatrixEvent,
@@ -59,6 +59,7 @@ interface IProps {
     timelineRenderingType?: TimelineRenderingType;
     showComposer?: boolean;
     composerRelation?: IEventRelation;
+    context: React.ContextType<typeof RoomContext>;
 }
 
 interface IState {
@@ -75,12 +76,10 @@ interface IState {
     showReadReceipts?: boolean;
 }
 
-export default class TimelineCard extends React.Component<IProps, IState> {
-    public static contextType = RoomContext;
-
+class TimelineCard extends React.Component<IProps, IState> {
     private dispatcherRef?: string;
     private layoutWatcherRef?: string;
-    private timelinePanel = React.createRef<TimelinePanel>();
+    private timelinePanel = React.createRef<React.ComponentRef<typeof TimelinePanel>>();
     private card = React.createRef<HTMLDivElement>();
     private readReceiptsSettingWatcher: string | undefined;
 
@@ -223,8 +222,8 @@ export default class TimelineCard extends React.Component<IProps, IState> {
         return (
             <RoomContext.Provider
                 value={{
-                    ...this.context,
-                    timelineRenderingType: this.props.timelineRenderingType ?? this.context.timelineRenderingType,
+                    ...this.props.context,
+                    timelineRenderingType: this.props.timelineRenderingType ?? this.props.context.timelineRenderingType,
                     liveTimeline: this.props.timelineSet?.getLiveTimeline(),
                     narrow: this.state.narrow,
                 }}
@@ -246,7 +245,7 @@ export default class TimelineCard extends React.Component<IProps, IState> {
                             manageReadMarkers={false} // No RM support in the TimelineCard
                             sendReadReceiptOnLoad={true}
                             timelineSet={this.props.timelineSet}
-                            showUrlPreview={this.context.showUrlPreview}
+                            showUrlPreview={this.props.context.showUrlPreview}
                             // The right panel timeline (and therefore threads) don't support IRC layout at this time
                             layout={this.state.layout === Layout.Bubble ? Layout.Bubble : Layout.Group}
                             hideThreadedMessages={false}
@@ -281,3 +280,7 @@ export default class TimelineCard extends React.Component<IProps, IState> {
         );
     }
 }
+
+export default forwardRef<TimelineCard, Omit<IProps, "context">>((props, ref) => (
+    <RoomContext.Consumer>{(context) => <TimelineCard {...props} context={context} ref={ref} />}</RoomContext.Consumer>
+));
diff --git a/src/components/views/room_settings/AliasSettings.tsx b/src/components/views/room_settings/AliasSettings.tsx
index 3b2f294e5c1..06f1661143b 100644
--- a/src/components/views/room_settings/AliasSettings.tsx
+++ b/src/components/views/room_settings/AliasSettings.tsx
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, { ChangeEvent, ContextType, createRef, SyntheticEvent } from "react";
+import React, { ChangeEvent, createRef, SyntheticEvent } from "react";
 import { MatrixEvent, EventType } from "matrix-js-sdk/src/matrix";
 import { logger } from "matrix-js-sdk/src/logger";
 import { RoomCanonicalAliasEventContent } from "matrix-js-sdk/src/types";
@@ -27,8 +27,8 @@ import ErrorDialog from "../dialogs/ErrorDialog";
 import AccessibleButton from "../elements/AccessibleButton";
 import Modal from "../../../Modal";
 import RoomPublishSetting from "./RoomPublishSetting";
-import RoomAliasField from "../elements/RoomAliasField";
-import MatrixClientContext from "../../../contexts/MatrixClientContext";
+import RoomAliasField, { RoomAliasField as RoomAliasFieldClass } from "../elements/RoomAliasField";
+import { MatrixClientProps, withMatrixClientHOC } from "../../../contexts/MatrixClientContext";
 import SettingsFieldset from "../settings/SettingsFieldset";
 
 interface IEditableAliasesListProps {
@@ -37,7 +37,7 @@ interface IEditableAliasesListProps {
 }
 
 class EditableAliasesList extends EditableItemList<IEditableAliasesListProps> {
-    private aliasField = createRef<RoomAliasField>();
+    private aliasField = createRef<RoomAliasFieldClass>();
 
     private onAliasAdded = async (ev: SyntheticEvent): Promise<void> => {
         ev.preventDefault();
@@ -78,7 +78,7 @@ class EditableAliasesList extends EditableItemList<IEditableAliasesListProps> {
     }
 }
 
-interface IProps {
+interface IProps extends MatrixClientProps {
     roomId: string;
     canSetCanonicalAlias: boolean;
     canSetAliases: boolean;
@@ -100,17 +100,14 @@ interface IState {
     newAltAlias?: string;
 }
 
-export default class AliasSettings extends React.Component<IProps, IState> {
-    public static contextType = MatrixClientContext;
-    public context!: ContextType<typeof MatrixClientContext>;
-
+class AliasSettings extends React.Component<IProps, IState> {
     public static defaultProps = {
         canSetAliases: false,
         canSetCanonicalAlias: false,
     };
 
-    public constructor(props: IProps, context: ContextType<typeof MatrixClientContext>) {
-        super(props, context);
+    public constructor(props: IProps) {
+        super(props);
 
         const state: IState = {
             altAliases: [],
@@ -144,7 +141,7 @@ export default class AliasSettings extends React.Component<IProps, IState> {
     private async loadLocalAliases(): Promise<void> {
         this.setState({ localAliasesLoading: true });
         try {
-            const mxClient = this.context;
+            const mxClient = this.props.mxClient;
 
             let localAliases: string[] = [];
             const response = await mxClient.getLocalAliases(this.props.roomId);
@@ -176,7 +173,7 @@ export default class AliasSettings extends React.Component<IProps, IState> {
 
         if (alias) eventContent["alias"] = alias;
 
-        this.context
+        this.props.mxClient
             .sendStateEvent(this.props.roomId, EventType.RoomCanonicalAlias, eventContent, "")
             .catch((err) => {
                 logger.error(err);
@@ -207,7 +204,7 @@ export default class AliasSettings extends React.Component<IProps, IState> {
             eventContent["alt_aliases"] = altAliases;
         }
 
-        this.context
+        this.props.mxClient
             .sendStateEvent(this.props.roomId, EventType.RoomCanonicalAlias, eventContent, "")
             .then(() => {
                 this.setState({
@@ -234,10 +231,10 @@ export default class AliasSettings extends React.Component<IProps, IState> {
     private onLocalAliasAdded = (alias?: string): void => {
         if (!alias || alias.length === 0) return; // ignore attempts to create blank aliases
 
-        const localDomain = this.context.getDomain();
+        const localDomain = this.props.mxClient.getDomain();
         if (!alias.includes(":")) alias += ":" + localDomain;
 
-        this.context
+        this.props.mxClient
             .createAlias(alias, this.props.roomId)
             .then(() => {
                 this.setState({
@@ -261,7 +258,7 @@ export default class AliasSettings extends React.Component<IProps, IState> {
         const alias = this.state.localAliases[index];
         // TODO: In future, we should probably be making sure that the alias actually belongs
         // to this room. See https://github.com/vector-im/element-web/issues/7353
-        this.context
+        this.props.mxClient
             .deleteAlias(alias)
             .then(() => {
                 const localAliases = this.state.localAliases.filter((a) => a !== alias);
@@ -330,7 +327,7 @@ export default class AliasSettings extends React.Component<IProps, IState> {
     }
 
     public render(): React.ReactNode {
-        const mxClient = this.context;
+        const mxClient = this.props.mxClient;
         const localDomain = mxClient.getDomain()!;
         const isSpaceRoom = mxClient.getRoom(this.props.roomId)?.isSpaceRoom();
 
@@ -455,3 +452,5 @@ export default class AliasSettings extends React.Component<IProps, IState> {
         );
     }
 }
+
+export default withMatrixClientHOC(AliasSettings);
diff --git a/src/components/views/rooms/Autocomplete.tsx b/src/components/views/rooms/Autocomplete.tsx
index 8eedf0867ea..1dde894624c 100644
--- a/src/components/views/rooms/Autocomplete.tsx
+++ b/src/components/views/rooms/Autocomplete.tsx
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, { createRef, KeyboardEvent } from "react";
+import React, { createRef, forwardRef, KeyboardEvent } from "react";
 import classNames from "classnames";
 import { flatMap } from "lodash";
 import { Room } from "matrix-js-sdk/src/matrix";
@@ -38,6 +38,7 @@ interface IProps {
     selection: ISelectionRange;
     // The room in which we're autocompleting
     room: Room;
+    context: React.ContextType<typeof RoomContext>;
 }
 
 interface IState {
@@ -49,14 +50,12 @@ interface IState {
     forceComplete: boolean;
 }
 
-export default class Autocomplete extends React.PureComponent<IProps, IState> {
+export class Autocomplete extends React.PureComponent<IProps, IState> {
     public autocompleter?: Autocompleter;
     public queryRequested?: string;
     public debounceCompletionsRequest?: number;
     private containerRef = createRef<HTMLDivElement>();
 
-    public static contextType = RoomContext;
-
     public constructor(props: IProps) {
         super(props);
 
@@ -80,7 +79,7 @@ export default class Autocomplete extends React.PureComponent<IProps, IState> {
     }
 
     public componentDidMount(): void {
-        this.autocompleter = new Autocompleter(this.props.room, this.context.timelineRenderingType);
+        this.autocompleter = new Autocompleter(this.props.room, this.props.context.timelineRenderingType);
         this.applyNewProps();
     }
 
@@ -320,3 +319,7 @@ export default class Autocomplete extends React.PureComponent<IProps, IState> {
         ) : null;
     }
 }
+
+export default forwardRef<Autocomplete, Omit<IProps, "context">>((props, ref) => (
+    <RoomContext.Consumer>{(context) => <Autocomplete {...props} context={context} ref={ref} />}</RoomContext.Consumer>
+));
diff --git a/src/components/views/rooms/BasicMessageComposer.tsx b/src/components/views/rooms/BasicMessageComposer.tsx
index 061dfe27039..50933ad82d9 100644
--- a/src/components/views/rooms/BasicMessageComposer.tsx
+++ b/src/components/views/rooms/BasicMessageComposer.tsx
@@ -123,7 +123,7 @@ interface IState {
 
 export default class BasicMessageEditor extends React.Component<IProps, IState> {
     public readonly editorRef = createRef<HTMLDivElement>();
-    private autocompleteRef = createRef<Autocomplete>();
+    private autocompleteRef = createRef<React.ComponentRef<typeof Autocomplete>>();
     private formatBarRef = createRef<MessageComposerFormatBar>();
 
     private modifiedFlag = false;
diff --git a/src/components/views/rooms/EditMessageComposer.tsx b/src/components/views/rooms/EditMessageComposer.tsx
index fabca13a1c7..1f13aa48e1d 100644
--- a/src/components/views/rooms/EditMessageComposer.tsx
+++ b/src/components/views/rooms/EditMessageComposer.tsx
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, { createRef, KeyboardEvent } from "react";
+import React, { createRef, forwardRef, KeyboardEvent } from "react";
 import classNames from "classnames";
 import { EventStatus, MatrixEvent, Room, MsgType } from "matrix-js-sdk/src/matrix";
 import { logger } from "matrix-js-sdk/src/logger";
@@ -122,28 +122,25 @@ export function createEditContent(
 interface IEditMessageComposerProps extends MatrixClientProps {
     editState: EditorStateTransfer;
     className?: string;
+    context: React.ContextType<typeof RoomContext>;
 }
 interface IState {
     saveDisabled: boolean;
 }
 
 class EditMessageComposer extends React.Component<IEditMessageComposerProps, IState> {
-    public static contextType = RoomContext;
-    public context!: React.ContextType<typeof RoomContext>;
-
     private readonly editorRef = createRef<BasicMessageComposer>();
     private readonly dispatcherRef: string;
     private readonly replyToEvent?: MatrixEvent;
     private model!: EditorModel;
 
-    public constructor(props: IEditMessageComposerProps, context: React.ContextType<typeof RoomContext>) {
+    public constructor(props: IEditMessageComposerProps) {
         super(props);
-        this.context = context; // otherwise React will only set it prior to render due to type def above
 
         const isRestored = this.createEditorModel();
         const ev = this.props.editState.getEvent();
 
-        this.replyToEvent = ev.replyEventId ? this.context.room?.findEventById(ev.replyEventId) : undefined;
+        this.replyToEvent = ev.replyEventId ? this.props.context.room?.findEventById(ev.replyEventId) : undefined;
 
         const editContent = createEditContent(this.model, ev, this.replyToEvent);
         this.state = {
@@ -155,10 +152,10 @@ class EditMessageComposer extends React.Component<IEditMessageComposerProps, ISt
     }
 
     private getRoom(): Room {
-        if (!this.context.room) {
+        if (!this.props.context.room) {
             throw new Error(`Cannot render without room`);
         }
-        return this.context.room;
+        return this.props.context.room;
     }
 
     private onKeyDown = (event: KeyboardEvent): void => {
@@ -191,7 +188,7 @@ class EditMessageComposer extends React.Component<IEditMessageComposerProps, ISt
                     dis.dispatch({
                         action: Action.EditEvent,
                         event: previousEvent,
-                        timelineRenderingType: this.context.timelineRenderingType,
+                        timelineRenderingType: this.props.context.timelineRenderingType,
                     });
                     event.preventDefault();
                 }
@@ -211,7 +208,7 @@ class EditMessageComposer extends React.Component<IEditMessageComposerProps, ISt
                     dis.dispatch({
                         action: Action.EditEvent,
                         event: nextEvent,
-                        timelineRenderingType: this.context.timelineRenderingType,
+                        timelineRenderingType: this.props.context.timelineRenderingType,
                     });
                 } else {
                     this.cancelEdit();
@@ -230,16 +227,16 @@ class EditMessageComposer extends React.Component<IEditMessageComposerProps, ISt
         dis.dispatch({
             action: Action.EditEvent,
             event: null,
-            timelineRenderingType: this.context.timelineRenderingType,
+            timelineRenderingType: this.props.context.timelineRenderingType,
         });
         dis.dispatch({
             action: Action.FocusSendMessageComposer,
-            context: this.context.timelineRenderingType,
+            context: this.props.context.timelineRenderingType,
         });
     }
 
     private get editorRoomKey(): string {
-        return editorRoomKey(this.props.editState.getEvent().getRoomId()!, this.context.timelineRenderingType);
+        return editorRoomKey(this.props.editState.getEvent().getRoomId()!, this.props.context.timelineRenderingType);
     }
 
     private get editorStateKey(): string {
@@ -247,7 +244,7 @@ class EditMessageComposer extends React.Component<IEditMessageComposerProps, ISt
     }
 
     private get events(): MatrixEvent[] {
-        const liveTimelineEvents = this.context.liveTimeline?.getEvents();
+        const liveTimelineEvents = this.props.context.liveTimeline?.getEvents();
         const room = this.getRoom();
         if (!liveTimelineEvents || !room) return [];
         const pendingEvents = room.getPendingEvents();
@@ -368,7 +365,7 @@ class EditMessageComposer extends React.Component<IEditMessageComposerProps, ISt
                     // re-focus the composer after QuestionDialog is closed
                     dis.dispatch({
                         action: Action.FocusAComposer,
-                        context: this.context.timelineRenderingType,
+                        context: this.props.context.timelineRenderingType,
                     });
                     // if !sendAnyway bail to let the user edit the composer and try again
                     if (!sendAnyway) return;
@@ -462,7 +459,7 @@ class EditMessageComposer extends React.Component<IEditMessageComposerProps, ISt
         if (!this.editorRef.current) return;
 
         if (payload.action === Action.ComposerInsert) {
-            if (payload.timelineRenderingType !== this.context.timelineRenderingType) return;
+            if (payload.timelineRenderingType !== this.props.context.timelineRenderingType) return;
             if (payload.composerType !== ComposerType.Edit) return;
 
             if (payload.userId) {
@@ -506,4 +503,10 @@ class EditMessageComposer extends React.Component<IEditMessageComposerProps, ISt
 }
 
 const EditMessageComposerWithMatrixClient = withMatrixClientHOC(EditMessageComposer);
-export default EditMessageComposerWithMatrixClient;
+export default forwardRef<EditMessageComposer, Omit<IEditMessageComposerProps, "context" | "mxClient">>(
+    (props, ref) => (
+        <RoomContext.Consumer>
+            {(context) => <EditMessageComposerWithMatrixClient {...props} context={context} ref={ref} />}
+        </RoomContext.Consumer>
+    ),
+);
diff --git a/src/components/views/rooms/EventTile.tsx b/src/components/views/rooms/EventTile.tsx
index 108e0d9d938..32ff6c2b4c0 100644
--- a/src/components/views/rooms/EventTile.tsx
+++ b/src/components/views/rooms/EventTile.tsx
@@ -266,6 +266,10 @@ interface IState {
     threadNotification?: NotificationCountType;
 }
 
+interface Props extends EventTileProps {
+    context: React.ContextType<typeof RoomContext>;
+}
+
 /**
  * When true, the tile qualifies for some sort of special read receipt.
  * This could be a 'sending' or 'sent' receipt, for example.
@@ -282,7 +286,7 @@ export function isEligibleForSpecialReceipt(event: MatrixEvent): boolean {
 }
 
 // MUST be rendered within a RoomContext with a set timelineRenderingType
-export class UnwrappedEventTile extends React.Component<EventTileProps, IState> {
+class UnwrappedEventTile extends React.Component<Props, IState> {
     private suppressReadReceiptAnimation: boolean;
     private isListeningForReceipts: boolean;
     private tile = createRef<IEventTileType>();
@@ -297,13 +301,10 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
         layout: Layout.Group,
     };
 
-    public static contextType = RoomContext;
-    public context!: React.ContextType<typeof RoomContext>;
-
     private unmounted = false;
 
-    public constructor(props: EventTileProps, context: React.ContextType<typeof RoomContext>) {
-        super(props, context);
+    public constructor(props: Props) {
+        super(props);
 
         const thread = this.thread;
 
@@ -508,7 +509,10 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
             );
         }
 
-        if (this.context.timelineRenderingType === TimelineRenderingType.Search && this.props.mxEvent.threadRootId) {
+        if (
+            this.props.context.timelineRenderingType === TimelineRenderingType.Search &&
+            this.props.mxEvent.threadRootId
+        ) {
             if (this.props.highlightLink) {
                 return (
                     <a className="mx_ThreadSummary_icon" href={this.props.highlightLink}>
@@ -676,8 +680,8 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
      */
     private shouldHighlight(): boolean {
         if (this.props.forExport) return false;
-        if (this.context.timelineRenderingType === TimelineRenderingType.Notification) return false;
-        if (this.context.timelineRenderingType === TimelineRenderingType.ThreadsList) return false;
+        if (this.props.context.timelineRenderingType === TimelineRenderingType.Notification) return false;
+        if (this.props.context.timelineRenderingType === TimelineRenderingType.ThreadsList) return false;
 
         const cli = MatrixClientPeg.safeGet();
         const actions = cli.getPushActionsForEvent(this.props.mxEvent.replacingEvent() || this.props.mxEvent);
@@ -701,7 +705,7 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
         dis.dispatch<ComposerInsertPayload>({
             action: Action.ComposerInsert,
             userId: this.props.mxEvent.getSender()!,
-            timelineRenderingType: this.context.timelineRenderingType,
+            timelineRenderingType: this.props.context.timelineRenderingType,
         });
     };
 
@@ -715,7 +719,7 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
             highlighted: true,
             room_id: this.props.mxEvent.getRoomId(),
             metricsTrigger:
-                this.context.timelineRenderingType === TimelineRenderingType.Search ? "MessageSearch" : undefined,
+                this.props.context.timelineRenderingType === TimelineRenderingType.Search ? "MessageSearch" : undefined,
         });
     };
 
@@ -923,7 +927,7 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
         } = getEventDisplayInfo(
             MatrixClientPeg.safeGet(),
             this.props.mxEvent,
-            this.context.showHiddenEvents,
+            this.props.context.showHiddenEvents,
             this.shouldHideEvent(),
         );
         const { isQuoteExpanded } = this.state;
@@ -958,15 +962,15 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
 
         let isContinuation = this.props.continuation;
         if (
-            this.context.timelineRenderingType !== TimelineRenderingType.Room &&
-            this.context.timelineRenderingType !== TimelineRenderingType.Search &&
-            this.context.timelineRenderingType !== TimelineRenderingType.Thread &&
+            this.props.context.timelineRenderingType !== TimelineRenderingType.Room &&
+            this.props.context.timelineRenderingType !== TimelineRenderingType.Search &&
+            this.props.context.timelineRenderingType !== TimelineRenderingType.Thread &&
             this.props.layout !== Layout.Bubble
         ) {
             isContinuation = false;
         }
 
-        const isRenderingNotification = this.context.timelineRenderingType === TimelineRenderingType.Notification;
+        const isRenderingNotification = this.props.context.timelineRenderingType === TimelineRenderingType.Notification;
 
         const isEditing = !!this.props.editState;
         const classes = classNames({
@@ -990,7 +994,8 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
             mx_EventTile_emote: msgtype === MsgType.Emote,
             mx_EventTile_noSender: this.props.hideSender,
             mx_EventTile_clamp:
-                this.context.timelineRenderingType === TimelineRenderingType.ThreadsList || isRenderingNotification,
+                this.props.context.timelineRenderingType === TimelineRenderingType.ThreadsList ||
+                isRenderingNotification,
             mx_EventTile_noBubble: noBubbleEvent,
         });
 
@@ -1020,8 +1025,8 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
             avatarSize = "14px";
             needsSenderProfile = false;
         } else if (
-            this.context.timelineRenderingType === TimelineRenderingType.ThreadsList ||
-            (this.context.timelineRenderingType === TimelineRenderingType.Thread && !this.props.continuation)
+            this.props.context.timelineRenderingType === TimelineRenderingType.ThreadsList ||
+            (this.props.context.timelineRenderingType === TimelineRenderingType.Thread && !this.props.continuation)
         ) {
             avatarSize = "32px";
             needsSenderProfile = true;
@@ -1032,7 +1037,7 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
             avatarSize = "14px";
             needsSenderProfile = true;
         } else if (
-            (this.props.continuation && this.context.timelineRenderingType !== TimelineRenderingType.File) ||
+            (this.props.continuation && this.props.context.timelineRenderingType !== TimelineRenderingType.File) ||
             eventType === EventType.CallInvite ||
             ElementCall.CALL_EVENT_TYPE.matches(eventType)
         ) {
@@ -1058,7 +1063,7 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
             const viewUserOnClick =
                 !this.props.inhibitInteraction &&
                 ![TimelineRenderingType.ThreadsList, TimelineRenderingType.Notification].includes(
-                    this.context.timelineRenderingType,
+                    this.props.context.timelineRenderingType,
                 );
             avatar = (
                 <div className="mx_EventTile_avatar">
@@ -1074,13 +1079,13 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
 
         if (needsSenderProfile && this.props.hideSender !== true) {
             if (
-                this.context.timelineRenderingType === TimelineRenderingType.Room ||
-                this.context.timelineRenderingType === TimelineRenderingType.Search ||
-                this.context.timelineRenderingType === TimelineRenderingType.Pinned ||
-                this.context.timelineRenderingType === TimelineRenderingType.Thread
+                this.props.context.timelineRenderingType === TimelineRenderingType.Room ||
+                this.props.context.timelineRenderingType === TimelineRenderingType.Search ||
+                this.props.context.timelineRenderingType === TimelineRenderingType.Pinned ||
+                this.props.context.timelineRenderingType === TimelineRenderingType.Thread
             ) {
                 sender = <SenderProfile onClick={this.onSenderProfileClick} mxEvent={this.props.mxEvent} />;
-            } else if (this.context.timelineRenderingType === TimelineRenderingType.ThreadsList) {
+            } else if (this.props.context.timelineRenderingType === TimelineRenderingType.ThreadsList) {
                 sender = <SenderProfile mxEvent={this.props.mxEvent} withTooltip />;
             } else {
                 sender = <SenderProfile mxEvent={this.props.mxEvent} />;
@@ -1113,7 +1118,7 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
 
         // Thread panel shows the timestamp of the last reply in that thread
         let ts =
-            this.context.timelineRenderingType !== TimelineRenderingType.ThreadsList
+            this.props.context.timelineRenderingType !== TimelineRenderingType.ThreadsList
                 ? this.props.mxEvent.getTs()
                 : this.state.thread?.replyToEvent?.getTs();
         if (typeof ts !== "number") {
@@ -1123,7 +1128,7 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
 
         const messageTimestamp = (
             <MessageTimestamp
-                showRelative={this.context.timelineRenderingType === TimelineRenderingType.ThreadsList}
+                showRelative={this.props.context.timelineRenderingType === TimelineRenderingType.ThreadsList}
                 showTwelveHour={this.props.isTwelveHour}
                 ts={ts}
                 receivedTs={getLateEventInfo(this.props.mxEvent)?.received_ts}
@@ -1180,7 +1185,7 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
 
         let replyChain: JSX.Element | undefined;
         if (
-            haveRendererForEvent(this.props.mxEvent, MatrixClientPeg.safeGet(), this.context.showHiddenEvents) &&
+            haveRendererForEvent(this.props.mxEvent, MatrixClientPeg.safeGet(), this.props.context.showHiddenEvents) &&
             shouldDisplayReply(this.props.mxEvent)
         ) {
             replyChain = (
@@ -1202,7 +1207,7 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
         // Use `getSender()` because searched events might not have a proper `sender`.
         const isOwnEvent = this.props.mxEvent?.getSender() === MatrixClientPeg.safeGet().getUserId();
 
-        switch (this.context.timelineRenderingType) {
+        switch (this.props.context.timelineRenderingType) {
             case TimelineRenderingType.Thread: {
                 return React.createElement(
                     this.props.as || "li",
@@ -1242,7 +1247,7 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
                                     onHeightChanged: () => this.props.onHeightChanged,
                                     permalinkCreator: this.props.permalinkCreator!,
                                 },
-                                this.context.showHiddenEvents,
+                                this.props.context.showHiddenEvents,
                             )}
                             {actionBar}
                             <a href={permalink} onClick={this.onPermalinkClicked}>
@@ -1268,7 +1273,7 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
                         "aria-atomic": "true",
                         "data-scroll-tokens": scrollToken,
                         "data-layout": this.props.layout,
-                        "data-shape": this.context.timelineRenderingType,
+                        "data-shape": this.props.context.timelineRenderingType,
                         "data-self": isOwnEvent,
                         "data-has-reply": !!replyChain,
                         "onMouseEnter": () => this.setState({ hover: true }),
@@ -1277,7 +1282,7 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
                             const target = ev.currentTarget as HTMLElement;
                             let index = -1;
                             if (target.parentElement) index = Array.from(target.parentElement.children).indexOf(target);
-                            switch (this.context.timelineRenderingType) {
+                            switch (this.props.context.timelineRenderingType) {
                                 case TimelineRenderingType.Notification:
                                     this.viewInRoom(ev);
                                     break;
@@ -1333,7 +1338,7 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
                             </div>
                             {this.renderThreadPanelSummary()}
                         </div>
-                        {this.context.timelineRenderingType === TimelineRenderingType.ThreadsList && (
+                        {this.props.context.timelineRenderingType === TimelineRenderingType.ThreadsList && (
                             <EventTileThreadToolbar
                                 viewInRoom={this.viewInRoom}
                                 copyLinkToThread={this.copyLinkToThread}
@@ -1371,7 +1376,7 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
                                     onHeightChanged: this.props.onHeightChanged,
                                     permalinkCreator: this.props.permalinkCreator,
                                 },
-                                this.context.showHiddenEvents,
+                                this.props.context.showHiddenEvents,
                             )}
                         </div>,
                         <a
@@ -1419,7 +1424,7 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
                             {groupPadlock}
                             {replyChain}
                             {renderTile(
-                                this.context.timelineRenderingType,
+                                this.props.context.timelineRenderingType,
                                 {
                                     ...this.props,
 
@@ -1434,7 +1439,7 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
                                     onHeightChanged: this.props.onHeightChanged,
                                     permalinkCreator: this.props.permalinkCreator,
                                 },
-                                this.context.showHiddenEvents,
+                                this.props.context.showHiddenEvents,
                             )}
                             {actionBar}
                             {this.props.layout === Layout.IRC && (
@@ -1463,7 +1468,9 @@ const SafeEventTile = forwardRef<UnwrappedEventTile, EventTileProps>((props, ref
     return (
         <>
             <TileErrorBoundary mxEvent={props.mxEvent} layout={props.layout ?? Layout.Group}>
-                <UnwrappedEventTile ref={ref} {...props} />
+                <RoomContext.Consumer>
+                    {(context) => <UnwrappedEventTile {...props} ref={ref} context={context} />}
+                </RoomContext.Consumer>
             </TileErrorBoundary>
         </>
     );
diff --git a/src/components/views/rooms/LegacyRoomHeader.tsx b/src/components/views/rooms/LegacyRoomHeader.tsx
index 5fab692046d..fd9458fe774 100644
--- a/src/components/views/rooms/LegacyRoomHeader.tsx
+++ b/src/components/views/rooms/LegacyRoomHeader.tsx
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, { FC, useState, useMemo, useCallback } from "react";
+import React, { FC, useState, useMemo, useCallback, forwardRef } from "react";
 import classNames from "classnames";
 import { throttle } from "lodash";
 import { RoomStateEvent, ISearchResults } from "matrix-js-sdk/src/matrix";
@@ -470,7 +470,7 @@ export interface ISearchInfo {
     count?: number;
 }
 
-export interface IProps {
+interface IProps {
     room: Room;
     oobData?: IOOBData;
     inRoom: boolean;
@@ -478,7 +478,7 @@ export interface IProps {
     onInviteClick: (() => void) | null;
     onForgetClick: (() => void) | null;
     onAppsClick: (() => void) | null;
-    e2eStatus: E2EStatus;
+    e2eStatus?: E2EStatus;
     appsShown: boolean;
     searchInfo?: ISearchInfo;
     excludedRightPanelPhaseButtons?: Array<RightPanelPhases>;
@@ -487,6 +487,7 @@ export interface IProps {
     viewingCall: boolean;
     activeCall: Call | null;
     additionalButtons?: ViewRoomOpts["buttons"];
+    context: React.ContextType<typeof RoomContext>;
 }
 
 interface IState {
@@ -498,7 +499,7 @@ interface IState {
 /**
  * @deprecated use `src/components/views/rooms/RoomHeader.tsx` instead
  */
-export default class RoomHeader extends React.Component<IProps, IState> {
+class LegacyRoomHeader extends React.Component<IProps, IState> {
     public static defaultProps: Partial<IProps> = {
         inRoom: false,
         excludedRightPanelPhaseButtons: [],
@@ -506,13 +507,11 @@ export default class RoomHeader extends React.Component<IProps, IState> {
         enableRoomOptionsMenu: true,
     };
 
-    public static contextType = RoomContext;
-    public context!: React.ContextType<typeof RoomContext>;
     private readonly client = this.props.room.client;
     private readonly featureAskToJoinWatcher: string;
 
-    public constructor(props: IProps, context: IState) {
-        super(props, context);
+    public constructor(props: IProps) {
+        super(props);
         const notiStore = RoomNotificationStateStore.instance.getRoomState(props.room);
         notiStore.on(NotificationStateEvents.Update, this.onNotificationUpdate);
         this.state = {
@@ -590,7 +589,7 @@ export default class RoomHeader extends React.Component<IProps, IState> {
     private renderButtons(isVideoRoom: boolean): React.ReactNode {
         const startButtons: JSX.Element[] = [];
 
-        if (!this.props.viewingCall && this.props.inRoom && !this.context.tombstone) {
+        if (!this.props.viewingCall && this.props.inRoom && !this.props.context.tombstone) {
             startButtons.push(<CallButtons key="calls" room={this.props.room} />);
         }
 
@@ -866,3 +865,9 @@ export default class RoomHeader extends React.Component<IProps, IState> {
         );
     }
 }
+
+export default forwardRef<LegacyRoomHeader, Omit<IProps, "context">>((props, ref) => (
+    <RoomContext.Consumer>
+        {(context) => <LegacyRoomHeader {...props} context={context} ref={ref} />}
+    </RoomContext.Consumer>
+));
diff --git a/src/components/views/rooms/MemberList.tsx b/src/components/views/rooms/MemberList.tsx
index 828f9691dae..a78c3da01d8 100644
--- a/src/components/views/rooms/MemberList.tsx
+++ b/src/components/views/rooms/MemberList.tsx
@@ -17,7 +17,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from "react";
+import React, { forwardRef } from "react";
 import {
     MatrixEvent,
     Room,
@@ -66,6 +66,7 @@ interface IProps {
     searchQuery: string;
     onClose(): void;
     onSearchQueryChanged: (query: string) => void;
+    context: React.ContextType<typeof SDKContext>;
 }
 
 interface IState {
@@ -77,18 +78,16 @@ interface IState {
     truncateAtInvited: number;
 }
 
-export default class MemberList extends React.Component<IProps, IState> {
+class MemberList extends React.Component<IProps, IState> {
     private readonly showPresence: boolean;
     private mounted = false;
 
-    public static contextType = SDKContext;
-    public context!: React.ContextType<typeof SDKContext>;
     private tiles: Map<string, MemberTile> = new Map();
 
-    public constructor(props: IProps, context: React.ContextType<typeof SDKContext>) {
+    public constructor(props: IProps) {
         super(props);
         this.state = this.getMembersState([], []);
-        this.showPresence = context?.memberListStore.isPresenceEnabled() ?? true;
+        this.showPresence = props.context?.memberListStore.isPresenceEnabled() ?? true;
         this.mounted = true;
         this.listenForMembersChanges();
     }
@@ -218,7 +217,7 @@ export default class MemberList extends React.Component<IProps, IState> {
         if (showLoadingSpinner) {
             this.setState({ loading: true });
         }
-        const { joined, invited } = await this.context.memberListStore.loadMemberList(
+        const { joined, invited } = await this.props.context.memberListStore.loadMemberList(
             this.props.roomId,
             this.props.searchQuery,
         );
@@ -449,3 +448,7 @@ export default class MemberList extends React.Component<IProps, IState> {
         inviteToRoom(room);
     };
 }
+
+export default forwardRef<MemberList, Omit<IProps, "context">>((props, ref) => (
+    <SDKContext.Consumer>{(context) => <MemberList {...props} context={context} ref={ref} />}</SDKContext.Consumer>
+));
diff --git a/src/components/views/rooms/MessageComposer.tsx b/src/components/views/rooms/MessageComposer.tsx
index f9aae433feb..4911a216a86 100644
--- a/src/components/views/rooms/MessageComposer.tsx
+++ b/src/components/views/rooms/MessageComposer.tsx
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, { createRef, ReactNode } from "react";
+import React, { createRef, forwardRef, ReactNode } from "react";
 import classNames from "classnames";
 import {
     IEventRelation,
@@ -44,7 +44,7 @@ import { RecordingState } from "../../../audio/VoiceRecording";
 import Tooltip, { Alignment } from "../elements/Tooltip";
 import ResizeNotifier from "../../../utils/ResizeNotifier";
 import { E2EStatus } from "../../../utils/ShieldUtils";
-import SendMessageComposer, { SendMessageComposer as SendMessageComposerClass } from "./SendMessageComposer";
+import SendMessageComposer from "./SendMessageComposer";
 import { ComposerInsertPayload } from "../../../dispatcher/payloads/ComposerInsertPayload";
 import { Action } from "../../../dispatcher/actions";
 import EditorModel from "../../../editor/model";
@@ -92,6 +92,7 @@ interface IProps extends MatrixClientProps {
     relation?: IEventRelation;
     e2eStatus?: E2EStatus;
     compact?: boolean;
+    context: React.ContextType<typeof RoomContext>;
 }
 
 interface IState {
@@ -113,16 +114,13 @@ interface IState {
 export class MessageComposer extends React.Component<IProps, IState> {
     private tooltipId = `mx_MessageComposer_${Math.random()}`;
     private dispatcherRef?: string;
-    private messageComposerInput = createRef<SendMessageComposerClass>();
-    private voiceRecordingButton = createRef<VoiceRecordComposerTile>();
+    private messageComposerInput = createRef<React.ComponentRef<typeof SendMessageComposer>>();
+    private voiceRecordingButton = createRef<React.ComponentRef<typeof VoiceRecordComposerTile>>();
     private ref: React.RefObject<HTMLDivElement> = createRef();
     private instanceId: number;
 
     private _voiceRecording: Optional<VoiceMessageRecording>;
 
-    public static contextType = RoomContext;
-    public context!: React.ContextType<typeof RoomContext>;
-
     public static defaultProps = {
         compact: false,
         showVoiceBroadcastButton: false,
@@ -189,7 +187,7 @@ export class MessageComposer extends React.Component<IProps, IState> {
 
     private onResize = (type: UI_EVENTS, entry: ResizeObserverEntry): void => {
         if (type === UI_EVENTS.Resize) {
-            const { narrow } = this.context;
+            const { narrow } = this.props.context;
             this.setState({
                 isMenuOpen: !narrow ? false : this.state.isMenuOpen,
                 isStickerPickerOpen: false,
@@ -200,7 +198,7 @@ export class MessageComposer extends React.Component<IProps, IState> {
     private onAction = (payload: ActionPayload): void => {
         switch (payload.action) {
             case "reply_to_event":
-                if (payload.context === this.context.timelineRenderingType) {
+                if (payload.context === this.props.context.timelineRenderingType) {
                     // add a timeout for the reply preview to be rendered, so
                     // that the ScrollPanel listening to the resizeNotifier can
                     // correctly measure it's new height and scroll down to keep
@@ -274,7 +272,7 @@ export class MessageComposer extends React.Component<IProps, IState> {
     private onTombstoneClick = (ev: ButtonEvent): void => {
         ev.preventDefault();
 
-        const replacementRoomId = this.context.tombstone?.getContent()["replacement_room"];
+        const replacementRoomId = this.props.context.tombstone?.getContent()["replacement_room"];
         const replacementRoom = MatrixClientPeg.safeGet().getRoom(replacementRoomId);
         let createEventId: string | undefined;
         if (replacementRoom) {
@@ -282,7 +280,7 @@ export class MessageComposer extends React.Component<IProps, IState> {
             if (createEvent?.getId()) createEventId = createEvent.getId();
         }
 
-        const sender = this.context.tombstone?.getSender();
+        const sender = this.props.context.tombstone?.getSender();
         const viaServers = sender ? [sender.split(":").slice(1).join(":")] : undefined;
 
         dis.dispatch<ViewRoomPayload>({
@@ -324,7 +322,7 @@ export class MessageComposer extends React.Component<IProps, IState> {
         dis.dispatch<ComposerInsertPayload>({
             action: Action.ComposerInsert,
             text: emoji,
-            timelineRenderingType: this.context.timelineRenderingType,
+            timelineRenderingType: this.props.context.timelineRenderingType,
         });
         return true;
     };
@@ -345,11 +343,11 @@ export class MessageComposer extends React.Component<IProps, IState> {
             this.setState({ composerContent: "", initialComposerContent: "" });
             dis.dispatch({
                 action: Action.ClearAndFocusSendMessageComposer,
-                timelineRenderingType: this.context.timelineRenderingType,
+                timelineRenderingType: this.props.context.timelineRenderingType,
             });
             await sendMessage(composerContent, this.state.isRichTextEnabled, {
                 mxClient: this.props.mxClient,
-                roomContext: this.context,
+                roomContext: this.props.context,
                 permalinkCreator,
                 relation,
                 replyToEvent,
@@ -467,7 +465,7 @@ export class MessageComposer extends React.Component<IProps, IState> {
             this.voiceRecordingButton.current?.onRecordStartEndClick();
         }
 
-        if (this.context.narrow) {
+        if (this.props.context.narrow) {
             this.toggleButtonMenu();
         }
     };
@@ -483,7 +481,7 @@ export class MessageComposer extends React.Component<IProps, IState> {
         const controls: ReactNode[] = [];
         const menuPosition = this.getMenuPosition();
 
-        const canSendMessages = this.context.canSendMessages && !this.context.tombstone;
+        const canSendMessages = this.props.context.canSendMessages && !this.props.context.tombstone;
         let composer: ReactNode;
         if (canSendMessages) {
             if (this.state.isWysiwygLabEnabled && menuPosition) {
@@ -528,8 +526,8 @@ export class MessageComposer extends React.Component<IProps, IState> {
                     replyToEvent={this.props.replyToEvent}
                 />,
             );
-        } else if (this.context.tombstone) {
-            const replacementRoomId = this.context.tombstone.getContent()["replacement_room"];
+        } else if (this.props.context.tombstone) {
+            const replacementRoomId = this.props.context.tombstone.getContent()["replacement_room"];
 
             const continuesLink = replacementRoomId ? (
                 <a
@@ -667,4 +665,8 @@ export class MessageComposer extends React.Component<IProps, IState> {
 }
 
 const MessageComposerWithMatrixClient = withMatrixClientHOC(MessageComposer);
-export default MessageComposerWithMatrixClient;
+export default forwardRef<MessageComposer, Omit<IProps, "context" | "mxClient">>((props, ref) => (
+    <RoomContext.Consumer>
+        {(context) => <MessageComposerWithMatrixClient {...props} context={context} ref={ref} />}
+    </RoomContext.Consumer>
+));
diff --git a/src/components/views/rooms/MessageComposerButtons.tsx b/src/components/views/rooms/MessageComposerButtons.tsx
index 7f23efbce2b..88e8f2def37 100644
--- a/src/components/views/rooms/MessageComposerButtons.tsx
+++ b/src/components/views/rooms/MessageComposerButtons.tsx
@@ -289,20 +289,22 @@ function voiceRecordingButton(props: IProps, narrow: boolean): ReactElement | nu
 }
 
 function pollButton(room: Room, relation?: IEventRelation): ReactElement {
-    return <PollButton key="polls" room={room} relation={relation} />;
+    return (
+        <OverflowMenuContext.Consumer key="polls">
+            {(context) => <PollButton room={room} relation={relation} context={context} />}
+        </OverflowMenuContext.Consumer>
+    );
 }
 
 interface IPollButtonProps {
     room: Room;
     relation?: IEventRelation;
+    context: React.ContextType<typeof OverflowMenuContext>;
 }
 
 class PollButton extends React.PureComponent<IPollButtonProps> {
-    public static contextType = OverflowMenuContext;
-    public context!: React.ContextType<typeof OverflowMenuContext>;
-
     private onCreateClick = (): void => {
-        this.context?.(); // close overflow menu
+        this.props.context?.(); // close overflow menu
         const canSend = this.props.room.currentState.maySendEvent(
             M_POLL_START.name,
             MatrixClientPeg.safeGet().getSafeUserId(),
diff --git a/src/components/views/rooms/PinnedEventTile.tsx b/src/components/views/rooms/PinnedEventTile.tsx
index 1395dcc2c5a..42b0ef9b7c7 100644
--- a/src/components/views/rooms/PinnedEventTile.tsx
+++ b/src/components/views/rooms/PinnedEventTile.tsx
@@ -25,7 +25,6 @@ import MessageEvent from "../messages/MessageEvent";
 import MemberAvatar from "../avatars/MemberAvatar";
 import { _t } from "../../../languageHandler";
 import { formatDate } from "../../../DateUtils";
-import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import { getUserNameColorClass } from "../../../utils/FormattingUtils";
 import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
 import { ViewRoomPayload } from "../../../dispatcher/payloads/ViewRoomPayload";
@@ -40,9 +39,6 @@ interface IProps {
 const AVATAR_SIZE = "24px";
 
 export default class PinnedEventTile extends React.Component<IProps> {
-    public static contextType = MatrixClientContext;
-    public context!: React.ContextType<typeof MatrixClientContext>;
-
     private onTileClicked = (): void => {
         dis.dispatch<ViewRoomPayload>({
             action: Action.ViewRoom,
diff --git a/src/components/views/rooms/ReplyPreview.tsx b/src/components/views/rooms/ReplyPreview.tsx
index 50c625c4286..20b085755dc 100644
--- a/src/components/views/rooms/ReplyPreview.tsx
+++ b/src/components/views/rooms/ReplyPreview.tsx
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from "react";
+import React, { forwardRef } from "react";
 import { MatrixEvent } from "matrix-js-sdk/src/matrix";
 
 import dis from "../../../dispatcher/dispatcher";
@@ -35,11 +35,10 @@ function cancelQuoting(context: TimelineRenderingType): void {
 interface IProps {
     permalinkCreator?: RoomPermalinkCreator;
     replyToEvent?: MatrixEvent;
+    context: React.ContextType<typeof RoomContext>;
 }
 
-export default class ReplyPreview extends React.Component<IProps> {
-    public static contextType = RoomContext;
-
+class ReplyPreview extends React.Component<IProps> {
     public render(): JSX.Element | null {
         if (!this.props.replyToEvent) return null;
 
@@ -50,7 +49,7 @@ export default class ReplyPreview extends React.Component<IProps> {
                         <span>{_t("composer|replying_title")}</span>
                         <AccessibleButton
                             className="mx_ReplyPreview_header_cancel"
-                            onClick={() => cancelQuoting(this.context.timelineRenderingType)}
+                            onClick={() => cancelQuoting(this.props.context.timelineRenderingType)}
                         />
                     </div>
                     <ReplyTile mxEvent={this.props.replyToEvent} permalinkCreator={this.props.permalinkCreator} />
@@ -59,3 +58,7 @@ export default class ReplyPreview extends React.Component<IProps> {
         );
     }
 }
+
+export default forwardRef<ReplyPreview, Omit<IProps, "context">>((props, ref) => (
+    <RoomContext.Consumer>{(context) => <ReplyPreview {...props} context={context} ref={ref} />}</RoomContext.Consumer>
+));
diff --git a/src/components/views/rooms/ReplyTile.tsx b/src/components/views/rooms/ReplyTile.tsx
index 56ca6ade609..986bb8d09cd 100644
--- a/src/components/views/rooms/ReplyTile.tsx
+++ b/src/components/views/rooms/ReplyTile.tsx
@@ -31,7 +31,7 @@ import MFileBody from "../messages/MFileBody";
 import MemberAvatar from "../avatars/MemberAvatar";
 import MVoiceMessageBody from "../messages/MVoiceMessageBody";
 import { ViewRoomPayload } from "../../../dispatcher/payloads/ViewRoomPayload";
-import { renderReplyTile } from "../../../events/EventTileFactory";
+import { EventTileTypeProps, renderReplyTile } from "../../../events/EventTileFactory";
 import { GetRelationsForEvent } from "../rooms/EventTile";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
 
@@ -147,13 +147,13 @@ export default class ReplyTile extends React.PureComponent<IProps> {
             );
         }
 
-        const msgtypeOverrides: Record<string, typeof React.Component> = {
+        const msgtypeOverrides: Record<string, React.ComponentType<EventTileTypeProps>> = {
             [MsgType.Image]: MImageReplyBody,
             // Override audio and video body with file body. We also hide the download/decrypt button using CSS
             [MsgType.Audio]: isVoiceMessage(mxEvent) ? MVoiceMessageBody : MFileBody,
             [MsgType.Video]: MFileBody,
         };
-        const evOverrides: Record<string, typeof React.Component> = {
+        const evOverrides: Record<string, React.ComponentType<EventTileTypeProps>> = {
             // Use MImageReplyBody so that the sticker isn't taking up a lot of space
             [EventType.Sticker]: MImageReplyBody,
         };
diff --git a/src/components/views/rooms/RoomList.tsx b/src/components/views/rooms/RoomList.tsx
index d573f3bbf02..8bd5231f4c7 100644
--- a/src/components/views/rooms/RoomList.tsx
+++ b/src/components/views/rooms/RoomList.tsx
@@ -18,7 +18,6 @@ import { EventType, RoomType, Room } from "matrix-js-sdk/src/matrix";
 import React, { ComponentType, createRef, ReactComponentElement, SyntheticEvent } from "react";
 
 import { IState as IRovingTabIndexState, RovingTabIndexProvider } from "../../../accessibility/RovingTabIndex";
-import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import { shouldShowComponent } from "../../../customisations/helpers/UIComponents";
 import { Action } from "../../../dispatcher/actions";
 import defaultDispatcher from "../../../dispatcher/dispatcher";
@@ -428,9 +427,6 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
     private dispatcherRef?: string;
     private treeRef = createRef<HTMLDivElement>();
 
-    public static contextType = MatrixClientContext;
-    public context!: React.ContextType<typeof MatrixClientContext>;
-
     public constructor(props: IProps) {
         super(props);
 
diff --git a/src/components/views/rooms/RoomUpgradeWarningBar.tsx b/src/components/views/rooms/RoomUpgradeWarningBar.tsx
index 99ae4f7ba4b..8e695aca7b5 100644
--- a/src/components/views/rooms/RoomUpgradeWarningBar.tsx
+++ b/src/components/views/rooms/RoomUpgradeWarningBar.tsx
@@ -21,9 +21,9 @@ import Modal from "../../../Modal";
 import { _t } from "../../../languageHandler";
 import RoomUpgradeDialog from "../dialogs/RoomUpgradeDialog";
 import AccessibleButton from "../elements/AccessibleButton";
-import MatrixClientContext from "../../../contexts/MatrixClientContext";
+import { MatrixClientProps, withMatrixClientHOC } from "../../../contexts/MatrixClientContext";
 
-interface IProps {
+interface IProps extends MatrixClientProps {
     room: Room;
 }
 
@@ -31,12 +31,9 @@ interface IState {
     upgraded?: boolean;
 }
 
-export default class RoomUpgradeWarningBar extends React.PureComponent<IProps, IState> {
-    public static contextType = MatrixClientContext;
-    public context!: React.ContextType<typeof MatrixClientContext>;
-
-    public constructor(props: IProps, context: React.ContextType<typeof MatrixClientContext>) {
-        super(props, context);
+class RoomUpgradeWarningBar extends React.PureComponent<IProps, IState> {
+    public constructor(props: IProps) {
+        super(props);
 
         const tombstone = this.props.room.currentState.getStateEvents("m.room.tombstone", "");
         this.state = {
@@ -45,11 +42,11 @@ export default class RoomUpgradeWarningBar extends React.PureComponent<IProps, I
     }
 
     public componentDidMount(): void {
-        this.context.on(RoomStateEvent.Events, this.onStateEvents);
+        this.props.mxClient.on(RoomStateEvent.Events, this.onStateEvents);
     }
 
     public componentWillUnmount(): void {
-        this.context.removeListener(RoomStateEvent.Events, this.onStateEvents);
+        this.props.mxClient.removeListener(RoomStateEvent.Events, this.onStateEvents);
     }
 
     private onStateEvents = (event: MatrixEvent): void => {
@@ -119,3 +116,5 @@ export default class RoomUpgradeWarningBar extends React.PureComponent<IProps, I
         );
     }
 }
+
+export default withMatrixClientHOC(RoomUpgradeWarningBar);
diff --git a/src/components/views/rooms/SearchResultTile.tsx b/src/components/views/rooms/SearchResultTile.tsx
index 99b5f0805c3..2efca1731b8 100644
--- a/src/components/views/rooms/SearchResultTile.tsx
+++ b/src/components/views/rooms/SearchResultTile.tsx
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from "react";
+import React, { forwardRef } from "react";
 import { MatrixEvent } from "matrix-js-sdk/src/matrix";
 
 import RoomContext, { TimelineRenderingType } from "../../../contexts/RoomContext";
@@ -40,17 +40,15 @@ interface IProps {
     ourEventsIndexes: number[];
     onHeightChanged?: () => void;
     permalinkCreator?: RoomPermalinkCreator;
+    context: React.ContextType<typeof RoomContext>;
 }
 
-export default class SearchResultTile extends React.Component<IProps> {
-    public static contextType = RoomContext;
-    public context!: React.ContextType<typeof RoomContext>;
-
+class SearchResultTile extends React.Component<IProps> {
     // A map of <callId, LegacyCallEventGrouper>
     private callEventGroupers = new Map<string, LegacyCallEventGrouper>();
 
-    public constructor(props: IProps, context: React.ContextType<typeof RoomContext>) {
-        super(props, context);
+    public constructor(props: IProps) {
+        super(props);
 
         this.buildLegacyCallEventGroupers(this.props.timeline);
     }
@@ -79,7 +77,7 @@ export default class SearchResultTile extends React.Component<IProps> {
                 highlights = this.props.searchHighlights;
             }
 
-            if (haveRendererForEvent(mxEv, cli, this.context?.showHiddenEvents)) {
+            if (haveRendererForEvent(mxEv, cli, this.props.context?.showHiddenEvents)) {
                 // do we need a date separator since the last event?
                 const prevEv = timeline[j - 1];
                 // is this a continuation of the previous message?
@@ -90,7 +88,7 @@ export default class SearchResultTile extends React.Component<IProps> {
                         prevEv,
                         mxEv,
                         cli,
-                        this.context?.showHiddenEvents,
+                        this.props.context?.showHiddenEvents,
                         TimelineRenderingType.Search,
                     );
 
@@ -108,7 +106,7 @@ export default class SearchResultTile extends React.Component<IProps> {
                             mxEv,
                             nextEv,
                             cli,
-                            this.context?.showHiddenEvents,
+                            this.props.context?.showHiddenEvents,
                             TimelineRenderingType.Search,
                         );
                 }
@@ -140,3 +138,9 @@ export default class SearchResultTile extends React.Component<IProps> {
         );
     }
 }
+
+export default forwardRef<SearchResultTile, Omit<IProps, "context">>((props, ref) => (
+    <RoomContext.Consumer>
+        {(context) => <SearchResultTile {...props} context={context} ref={ref} />}
+    </RoomContext.Consumer>
+));
diff --git a/src/components/views/rooms/SendMessageComposer.tsx b/src/components/views/rooms/SendMessageComposer.tsx
index 0ea0bdf94c1..113b5ef2b79 100644
--- a/src/components/views/rooms/SendMessageComposer.tsx
+++ b/src/components/views/rooms/SendMessageComposer.tsx
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, { createRef, KeyboardEvent, SyntheticEvent } from "react";
+import React, { createRef, forwardRef, KeyboardEvent, SyntheticEvent } from "react";
 import EMOJI_REGEX from "emojibase-regex";
 import {
     IContent,
@@ -250,12 +250,10 @@ interface ISendMessageComposerProps extends MatrixClientProps {
     onChange?(model: EditorModel): void;
     includeReplyLegacyFallback?: boolean;
     toggleStickerPickerOpen: () => void;
+    context: React.ContextType<typeof RoomContext>;
 }
 
-export class SendMessageComposer extends React.Component<ISendMessageComposerProps> {
-    public static contextType = RoomContext;
-    public context!: React.ContextType<typeof RoomContext>;
-
+class SendMessageComposer extends React.Component<ISendMessageComposerProps> {
     private readonly prepareToEncrypt?: DebouncedFunc<() => void>;
     private readonly editorRef = createRef<BasicMessageComposer>();
     private model: EditorModel;
@@ -267,9 +265,8 @@ export class SendMessageComposer extends React.Component<ISendMessageComposerPro
         includeReplyLegacyFallback: true,
     };
 
-    public constructor(props: ISendMessageComposerProps, context: React.ContextType<typeof RoomContext>) {
-        super(props, context);
-        this.context = context; // otherwise React will only set it prior to render due to type def above
+    public constructor(props: ISendMessageComposerProps) {
+        super(props);
 
         if (this.props.mxClient.isCryptoEnabled() && this.props.mxClient.isRoomEncrypted(this.props.room.roomId)) {
             this.prepareToEncrypt = throttle(
@@ -336,7 +333,7 @@ export class SendMessageComposer extends React.Component<ISendMessageComposerPro
             case KeyBindingAction.EditPrevMessage:
                 // selection must be collapsed and caret at start
                 if (this.editorRef.current?.isSelectionCollapsed() && this.editorRef.current?.isCaretAtStart()) {
-                    const events = this.context.liveTimeline
+                    const events = this.props.context.liveTimeline
                         ?.getEvents()
                         .concat(replyingToThread ? [] : this.props.room.getPendingEvents());
                     const editEvent = events
@@ -352,17 +349,17 @@ export class SendMessageComposer extends React.Component<ISendMessageComposerPro
                         dis.dispatch({
                             action: Action.EditEvent,
                             event: editEvent,
-                            timelineRenderingType: this.context.timelineRenderingType,
+                            timelineRenderingType: this.props.context.timelineRenderingType,
                         });
                     }
                 }
                 break;
             case KeyBindingAction.CancelReplyOrEdit:
-                if (!!this.context.replyToEvent) {
+                if (!!this.props.context.replyToEvent) {
                     dis.dispatch({
                         action: "reply_to_event",
                         event: null,
-                        context: this.context.timelineRenderingType,
+                        context: this.props.context.timelineRenderingType,
                     });
                     event.preventDefault();
                     event.stopPropagation();
@@ -395,7 +392,7 @@ export class SendMessageComposer extends React.Component<ISendMessageComposerPro
         dis.dispatch({
             action: "reply_to_event",
             event: replyEventId ? this.props.room.findEventById(replyEventId) : null,
-            context: this.context.timelineRenderingType,
+            context: this.props.context.timelineRenderingType,
         });
         if (parts) {
             this.model.reset(parts);
@@ -405,7 +402,7 @@ export class SendMessageComposer extends React.Component<ISendMessageComposerPro
     }
 
     private sendQuickReaction(): void {
-        const timeline = this.context.liveTimeline;
+        const timeline = this.props.context.liveTimeline;
         if (!timeline) return;
         const events = timeline.getEvents();
         const reaction = this.model.parts[1].text;
@@ -518,7 +515,7 @@ export class SendMessageComposer extends React.Component<ISendMessageComposerPro
                 // re-focus the composer after QuestionDialog is closed
                 dis.dispatch({
                     action: Action.FocusAComposer,
-                    context: this.context.timelineRenderingType,
+                    context: this.props.context.timelineRenderingType,
                 });
                 // if !sendAnyway bail to let the user edit the composer and try again
                 if (!sendAnyway) return;
@@ -563,7 +560,7 @@ export class SendMessageComposer extends React.Component<ISendMessageComposerPro
                 dis.dispatch({
                     action: "reply_to_event",
                     event: null,
-                    context: this.context.timelineRenderingType,
+                    context: this.props.context.timelineRenderingType,
                 });
             }
             dis.dispatch({ action: "message_sent" });
@@ -593,7 +590,7 @@ export class SendMessageComposer extends React.Component<ISendMessageComposerPro
         if (shouldSend && SettingsStore.getValue("scrollToBottomOnMessageSent")) {
             dis.dispatch({
                 action: "scroll_to_bottom",
-                timelineRenderingType: this.context.timelineRenderingType,
+                timelineRenderingType: this.props.context.timelineRenderingType,
             });
         }
     }
@@ -631,7 +628,7 @@ export class SendMessageComposer extends React.Component<ISendMessageComposerPro
                     dis.dispatch({
                         action: "reply_to_event",
                         event: this.props.room.findEventById(replyEventId),
-                        context: this.context.timelineRenderingType,
+                        context: this.props.context.timelineRenderingType,
                     });
                 }
                 return parts;
@@ -665,12 +662,12 @@ export class SendMessageComposer extends React.Component<ISendMessageComposerPro
         switch (payload.action) {
             case "reply_to_event":
             case Action.FocusSendMessageComposer:
-                if ((payload.context ?? TimelineRenderingType.Room) === this.context.timelineRenderingType) {
+                if ((payload.context ?? TimelineRenderingType.Room) === this.props.context.timelineRenderingType) {
                     this.editorRef.current?.focus();
                 }
                 break;
             case Action.ComposerInsert:
-                if (payload.timelineRenderingType !== this.context.timelineRenderingType) break;
+                if (payload.timelineRenderingType !== this.props.context.timelineRenderingType) break;
                 if (payload.composerType !== ComposerType.Send) break;
 
                 if (payload.userId) {
@@ -695,7 +692,7 @@ export class SendMessageComposer extends React.Component<ISendMessageComposerPro
                 this.props.room.roomId,
                 this.props.relation,
                 this.props.mxClient,
-                this.context.timelineRenderingType,
+                this.props.context.timelineRenderingType,
             );
             return true; // to skip internal onPaste handler
         }
@@ -734,7 +731,7 @@ export class SendMessageComposer extends React.Component<ISendMessageComposerPro
                                 this.props.room.roomId,
                                 this.props.relation,
                                 this.props.mxClient,
-                                this.context.replyToEvent,
+                                this.props.context.replyToEvent,
                             );
                         },
                         (error) => {
@@ -789,4 +786,10 @@ export class SendMessageComposer extends React.Component<ISendMessageComposerPro
 }
 
 const SendMessageComposerWithMatrixClient = withMatrixClientHOC(SendMessageComposer);
-export default SendMessageComposerWithMatrixClient;
+export default forwardRef<SendMessageComposer, Omit<ISendMessageComposerProps, "context" | "mxClient">>(
+    (props, ref) => (
+        <RoomContext.Consumer>
+            {(context) => <SendMessageComposerWithMatrixClient {...props} context={context} ref={ref} />}
+        </RoomContext.Consumer>
+    ),
+);
diff --git a/src/components/views/rooms/VoiceRecordComposerTile.tsx b/src/components/views/rooms/VoiceRecordComposerTile.tsx
index 70cabb474c9..4c8e8385131 100644
--- a/src/components/views/rooms/VoiceRecordComposerTile.tsx
+++ b/src/components/views/rooms/VoiceRecordComposerTile.tsx
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, { ReactNode } from "react";
+import React, { forwardRef, ReactNode } from "react";
 import { Room, IEventRelation, MatrixEvent } from "matrix-js-sdk/src/matrix";
 import { logger } from "matrix-js-sdk/src/logger";
 import { Optional } from "matrix-events-sdk";
@@ -50,6 +50,7 @@ interface IProps {
     permalinkCreator?: RoomPermalinkCreator;
     relation?: IEventRelation;
     replyToEvent?: MatrixEvent;
+    context: React.ContextType<typeof RoomContext>;
 }
 
 interface IState {
@@ -61,9 +62,7 @@ interface IState {
 /**
  * Container tile for rendering the voice message recorder in the composer.
  */
-export default class VoiceRecordComposerTile extends React.PureComponent<IProps, IState> {
-    public static contextType = RoomContext;
-    public context!: React.ContextType<typeof RoomContext>;
+class VoiceRecordComposerTile extends React.PureComponent<IProps, IState> {
     private voiceRecordingId: string;
 
     public constructor(props: IProps) {
@@ -141,7 +140,7 @@ export default class VoiceRecordComposerTile extends React.PureComponent<IProps,
                 defaultDispatcher.dispatch({
                     action: "reply_to_event",
                     event: null,
-                    context: this.context.timelineRenderingType,
+                    context: this.props.context.timelineRenderingType,
                 });
             }
 
@@ -323,3 +322,9 @@ export default class VoiceRecordComposerTile extends React.PureComponent<IProps,
         );
     }
 }
+
+export default forwardRef<VoiceRecordComposerTile, Omit<IProps, "context">>((props, ref) => (
+    <RoomContext.Consumer>
+        {(context) => <VoiceRecordComposerTile {...props} context={context} ref={ref} />}
+    </RoomContext.Consumer>
+));
diff --git a/src/components/views/rooms/wysiwyg_composer/components/WysiwygAutocomplete.tsx b/src/components/views/rooms/wysiwyg_composer/components/WysiwygAutocomplete.tsx
index 1e1cb0eb60d..7d4bcec7129 100644
--- a/src/components/views/rooms/wysiwyg_composer/components/WysiwygAutocomplete.tsx
+++ b/src/components/views/rooms/wysiwyg_composer/components/WysiwygAutocomplete.tsx
@@ -59,7 +59,7 @@ interface WysiwygAutocompleteProps {
 const WysiwygAutocomplete = forwardRef(
     (
         { suggestion, handleMention, handleCommand, handleAtRoomMention }: WysiwygAutocompleteProps,
-        ref: ForwardedRef<Autocomplete>,
+        ref: ForwardedRef<React.ComponentRef<typeof Autocomplete>>,
     ): JSX.Element | null => {
         const { room } = useRoomContext();
         const client = useMatrixClientContext();
diff --git a/src/components/views/rooms/wysiwyg_composer/components/WysiwygComposer.tsx b/src/components/views/rooms/wysiwyg_composer/components/WysiwygComposer.tsx
index ba0dad529b8..d22e8e270d0 100644
--- a/src/components/views/rooms/wysiwyg_composer/components/WysiwygComposer.tsx
+++ b/src/components/views/rooms/wysiwyg_composer/components/WysiwygComposer.tsx
@@ -58,7 +58,7 @@ export const WysiwygComposer = memo(function WysiwygComposer({
     eventRelation,
 }: WysiwygComposerProps) {
     const { room } = useRoomContext();
-    const autocompleteRef = useRef<Autocomplete | null>(null);
+    const autocompleteRef = useRef<React.ComponentRef<typeof Autocomplete> | null>(null);
 
     const inputEventProcessor = useInputEventProcessor(onSend, autocompleteRef, initialContent, eventRelation);
     const { ref, isWysiwygReady, content, actionStates, wysiwyg, suggestion, messageContent } = useWysiwyg({
diff --git a/src/components/views/rooms/wysiwyg_composer/hooks/useInputEventProcessor.ts b/src/components/views/rooms/wysiwyg_composer/hooks/useInputEventProcessor.ts
index a9cfa2966e1..aec01df7bd0 100644
--- a/src/components/views/rooms/wysiwyg_composer/hooks/useInputEventProcessor.ts
+++ b/src/components/views/rooms/wysiwyg_composer/hooks/useInputEventProcessor.ts
@@ -37,7 +37,7 @@ import { handleClipboardEvent, handleEventWithAutocomplete, isEventToHandleAsCli
 
 export function useInputEventProcessor(
     onSend: () => void,
-    autocompleteRef: React.RefObject<Autocomplete>,
+    autocompleteRef: React.RefObject<React.ComponentRef<typeof Autocomplete>>,
     initialContent?: string,
     eventRelation?: IEventRelation,
 ): (event: WysiwygEvent, composer: Wysiwyg, editor: HTMLElement) => WysiwygEvent | null {
@@ -105,7 +105,7 @@ function handleKeyboardEvent(
     roomContext: IRoomState,
     composerContext: ComposerContextState,
     mxClient: MatrixClient | undefined,
-    autocompleteRef: React.RefObject<Autocomplete>,
+    autocompleteRef: React.RefObject<React.ComponentRef<typeof Autocomplete>>,
 ): KeyboardEvent | null {
     const { editorStateTransfer } = composerContext;
     const isEditing = Boolean(editorStateTransfer);
diff --git a/src/components/views/rooms/wysiwyg_composer/hooks/usePlainTextListeners.ts b/src/components/views/rooms/wysiwyg_composer/hooks/usePlainTextListeners.ts
index 6121f0c877f..22eb0a358fe 100644
--- a/src/components/views/rooms/wysiwyg_composer/hooks/usePlainTextListeners.ts
+++ b/src/components/views/rooms/wysiwyg_composer/hooks/usePlainTextListeners.ts
@@ -55,7 +55,7 @@ export function usePlainTextListeners(
     eventRelation?: IEventRelation,
 ): {
     ref: RefObject<HTMLDivElement>;
-    autocompleteRef: React.RefObject<Autocomplete>;
+    autocompleteRef: React.RefObject<React.ComponentRef<typeof Autocomplete>>;
     content?: string;
     onBeforeInput(event: SyntheticEvent<HTMLDivElement, InputEvent | ClipboardEvent>): void;
     onInput(event: SyntheticEvent<HTMLDivElement, InputEvent | ClipboardEvent>): void;
@@ -72,7 +72,7 @@ export function usePlainTextListeners(
     const mxClient = useMatrixClientContext();
 
     const ref = useRef<HTMLDivElement | null>(null);
-    const autocompleteRef = useRef<Autocomplete | null>(null);
+    const autocompleteRef = useRef<React.ComponentRef<typeof Autocomplete> | null>(null);
     const [content, setContent] = useState<string | undefined>(initialContent);
 
     const send = useCallback(() => {
diff --git a/src/components/views/rooms/wysiwyg_composer/hooks/utils.ts b/src/components/views/rooms/wysiwyg_composer/hooks/utils.ts
index f95405c3bfd..8d4500314fe 100644
--- a/src/components/views/rooms/wysiwyg_composer/hooks/utils.ts
+++ b/src/components/views/rooms/wysiwyg_composer/hooks/utils.ts
@@ -70,7 +70,7 @@ export function setCursorPositionAtTheEnd(element: HTMLElement): void {
  * @returns boolean - whether or not the autocomplete has handled the event
  */
 export function handleEventWithAutocomplete(
-    autocompleteRef: RefObject<Autocomplete>,
+    autocompleteRef: RefObject<React.ComponentRef<typeof Autocomplete>>,
     // we get a React Keyboard event from plain text composer, a Keyboard Event from the rich text composer
     event: KeyboardEvent | React.KeyboardEvent<HTMLDivElement>,
 ): boolean {
diff --git a/src/components/views/settings/tabs/room/BridgeSettingsTab.tsx b/src/components/views/settings/tabs/room/BridgeSettingsTab.tsx
index cfe6b3ccd32..37734d30368 100644
--- a/src/components/views/settings/tabs/room/BridgeSettingsTab.tsx
+++ b/src/components/views/settings/tabs/room/BridgeSettingsTab.tsx
@@ -21,7 +21,7 @@ import { _t } from "../../../../../languageHandler";
 import BridgeTile from "../../BridgeTile";
 import SettingsTab from "../SettingsTab";
 import { SettingsSection } from "../../shared/SettingsSection";
-import MatrixClientContext from "../../../../../contexts/MatrixClientContext";
+import { MatrixClientProps, withMatrixClientHOC } from "../../../../../contexts/MatrixClientContext";
 
 const BRIDGE_EVENT_TYPES = [
     "uk.half-shot.bridge",
@@ -30,14 +30,11 @@ const BRIDGE_EVENT_TYPES = [
 
 const BRIDGES_LINK = "https://matrix.org/bridges/";
 
-interface IProps {
+interface IProps extends MatrixClientProps {
     room: Room;
 }
 
-export default class BridgeSettingsTab extends React.Component<IProps> {
-    public static contextType = MatrixClientContext;
-    public context!: React.ContextType<typeof MatrixClientContext>;
-
+class BridgeSettingsTab extends React.Component<IProps> {
     private renderBridgeCard(event: MatrixEvent, room: Room | null): ReactNode {
         const content = event.getContent();
         if (!room || !content?.channel || !content.protocol) return null;
@@ -54,7 +51,7 @@ export default class BridgeSettingsTab extends React.Component<IProps> {
     public render(): React.ReactNode {
         // This settings tab will only be invoked if the following function returns more
         // than 0 events, so no validation is needed at this stage.
-        const bridgeEvents = BridgeSettingsTab.getBridgeStateEvents(this.context, this.props.room.roomId);
+        const bridgeEvents = BridgeSettingsTab.getBridgeStateEvents(this.props.mxClient, this.props.room.roomId);
         const room = this.props.room;
 
         let content: JSX.Element;
@@ -108,3 +105,5 @@ export default class BridgeSettingsTab extends React.Component<IProps> {
         );
     }
 }
+
+export default withMatrixClientHOC(BridgeSettingsTab);
diff --git a/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.tsx b/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.tsx
index 7b260e3a7e6..b0cf7181ebd 100644
--- a/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.tsx
+++ b/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.tsx
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, { ContextType } from "react";
+import React from "react";
 import { Room } from "matrix-js-sdk/src/matrix";
 import { KnownMembership } from "matrix-js-sdk/src/types";
 
@@ -22,7 +22,7 @@ import { _t } from "../../../../../languageHandler";
 import RoomProfileSettings from "../../../room_settings/RoomProfileSettings";
 import AccessibleButton, { ButtonEvent } from "../../../elements/AccessibleButton";
 import dis from "../../../../../dispatcher/dispatcher";
-import MatrixClientContext from "../../../../../contexts/MatrixClientContext";
+import { MatrixClientProps, withMatrixClientHOC } from "../../../../../contexts/MatrixClientContext";
 import SettingsStore from "../../../../../settings/SettingsStore";
 import { UIFeature } from "../../../../../settings/UIFeature";
 import UrlPreviewSettings from "../../../room_settings/UrlPreviewSettings";
@@ -32,7 +32,7 @@ import SettingsSubsection from "../../shared/SettingsSubsection";
 import SettingsTab from "../SettingsTab";
 import { SettingsSection } from "../../shared/SettingsSection";
 
-interface IProps {
+interface IProps extends MatrixClientProps {
     room: Room;
 }
 
@@ -40,12 +40,9 @@ interface IState {
     isRoomPublished: boolean;
 }
 
-export default class GeneralRoomSettingsTab extends React.Component<IProps, IState> {
-    public static contextType = MatrixClientContext;
-    public context!: ContextType<typeof MatrixClientContext>;
-
-    public constructor(props: IProps, context: ContextType<typeof MatrixClientContext>) {
-        super(props, context);
+class GeneralRoomSettingsTab extends React.Component<IProps, IState> {
+    public constructor(props: IProps) {
+        super(props);
 
         this.state = {
             isRoomPublished: false, // loaded async
@@ -62,7 +59,7 @@ export default class GeneralRoomSettingsTab extends React.Component<IProps, ISta
     };
 
     public render(): React.ReactNode {
-        const client = this.context;
+        const client = this.props.mxClient;
         const room = this.props.room;
 
         const canSetAliases = true; // Previously, we arbitrarily only allowed admins to do this
@@ -107,3 +104,5 @@ export default class GeneralRoomSettingsTab extends React.Component<IProps, ISta
         );
     }
 }
+
+export default withMatrixClientHOC(GeneralRoomSettingsTab);
diff --git a/src/components/views/settings/tabs/room/NotificationSettingsTab.tsx b/src/components/views/settings/tabs/room/NotificationSettingsTab.tsx
index 1c536ed6d64..8aa7a0c022f 100644
--- a/src/components/views/settings/tabs/room/NotificationSettingsTab.tsx
+++ b/src/components/views/settings/tabs/room/NotificationSettingsTab.tsx
@@ -24,7 +24,7 @@ import SettingsStore from "../../../../../settings/SettingsStore";
 import { SettingLevel } from "../../../../../settings/SettingLevel";
 import { RoomEchoChamber } from "../../../../../stores/local-echo/RoomEchoChamber";
 import { EchoChamber } from "../../../../../stores/local-echo/EchoChamber";
-import MatrixClientContext from "../../../../../contexts/MatrixClientContext";
+import { MatrixClientProps, withMatrixClientHOC } from "../../../../../contexts/MatrixClientContext";
 import StyledRadioGroup from "../../../elements/StyledRadioGroup";
 import { RoomNotifState } from "../../../../../RoomNotifs";
 import defaultDispatcher from "../../../../../dispatcher/dispatcher";
@@ -35,7 +35,7 @@ import SettingsTab from "../SettingsTab";
 import { SettingsSection } from "../../shared/SettingsSection";
 import SettingsSubsection from "../../shared/SettingsSubsection";
 
-interface IProps {
+interface IProps extends MatrixClientProps {
     roomId: string;
     closeSettingsFn(): void;
 }
@@ -45,17 +45,14 @@ interface IState {
     uploadedFile: File | null;
 }
 
-export default class NotificationsSettingsTab extends React.Component<IProps, IState> {
+class NotificationsSettingsTab extends React.Component<IProps, IState> {
     private readonly roomProps: RoomEchoChamber;
     private soundUpload = createRef<HTMLInputElement>();
 
-    public static contextType = MatrixClientContext;
-    public context!: React.ContextType<typeof MatrixClientContext>;
+    public constructor(props: IProps) {
+        super(props);
 
-    public constructor(props: IProps, context: React.ContextType<typeof MatrixClientContext>) {
-        super(props, context);
-
-        this.roomProps = EchoChamber.forRoom(context.getRoom(this.props.roomId)!);
+        this.roomProps = EchoChamber.forRoom(props.mxClient.getRoom(this.props.roomId)!);
 
         let currentSound = "default";
         const soundData = Notifier.getSoundForRoom(this.props.roomId);
@@ -115,7 +112,7 @@ export default class NotificationsSettingsTab extends React.Component<IProps, IS
             type = "audio/ogg";
         }
 
-        const { content_uri: url } = await this.context.uploadContent(this.state.uploadedFile, {
+        const { content_uri: url } = await this.props.mxClient.uploadContent(this.state.uploadedFile, {
             type,
         });
 
@@ -315,3 +312,5 @@ export default class NotificationsSettingsTab extends React.Component<IProps, IS
         );
     }
 }
+
+export default withMatrixClientHOC(NotificationsSettingsTab);
diff --git a/src/components/views/settings/tabs/room/RolesRoomSettingsTab.tsx b/src/components/views/settings/tabs/room/RolesRoomSettingsTab.tsx
index 2197cad3dff..b7e87820317 100644
--- a/src/components/views/settings/tabs/room/RolesRoomSettingsTab.tsx
+++ b/src/components/views/settings/tabs/room/RolesRoomSettingsTab.tsx
@@ -33,7 +33,7 @@ import SdkConfig, { DEFAULTS } from "../../../../../SdkConfig";
 import { AddPrivilegedUsers } from "../../AddPrivilegedUsers";
 import SettingsTab from "../SettingsTab";
 import { SettingsSection } from "../../shared/SettingsSection";
-import MatrixClientContext from "../../../../../contexts/MatrixClientContext";
+import { MatrixClientProps, withMatrixClientHOC } from "../../../../../contexts/MatrixClientContext";
 import { PowerLevelSelector } from "../../PowerLevelSelector";
 
 interface IEventShowOpts {
@@ -80,19 +80,16 @@ function parseIntWithDefault(val: string, def: number): number {
     return isNaN(res) ? def : res;
 }
 
-interface IBannedUserProps {
+interface IBannedUserProps extends MatrixClientProps {
     canUnban?: boolean;
     member: RoomMember;
     by: string;
     reason?: string;
 }
 
-export class BannedUser extends React.Component<IBannedUserProps> {
-    public static contextType = MatrixClientContext;
-    public context!: React.ContextType<typeof MatrixClientContext>;
-
+class BannedUser extends React.Component<IBannedUserProps> {
     private onUnbanClick = (): void => {
-        this.context.unban(this.props.member.roomId, this.props.member.userId).catch((err) => {
+        this.props.mxClient.unban(this.props.member.roomId, this.props.member.userId).catch((err: Error) => {
             logger.error("Failed to unban: " + err);
             Modal.createDialog(ErrorDialog, {
                 title: _t("common|error"),
@@ -131,20 +128,17 @@ export class BannedUser extends React.Component<IBannedUserProps> {
     }
 }
 
-interface IProps {
+interface IProps extends MatrixClientProps {
     room: Room;
 }
 
-export default class RolesRoomSettingsTab extends React.Component<IProps> {
-    public static contextType = MatrixClientContext;
-    public context!: React.ContextType<typeof MatrixClientContext>;
-
+class RolesRoomSettingsTab extends React.Component<IProps> {
     public componentDidMount(): void {
-        this.context.on(RoomStateEvent.Update, this.onRoomStateUpdate);
+        this.props.mxClient.on(RoomStateEvent.Update, this.onRoomStateUpdate);
     }
 
     public componentWillUnmount(): void {
-        const client = this.context;
+        const client = this.props.mxClient;
         if (client) {
             client.removeListener(RoomStateEvent.Update, this.onRoomStateUpdate);
         }
@@ -176,7 +170,7 @@ export default class RolesRoomSettingsTab extends React.Component<IProps> {
     }
 
     private onPowerLevelsChanged = async (value: number, powerLevelKey: string): Promise<void> => {
-        const client = this.context;
+        const client = this.props.mxClient;
         const room = this.props.room;
         const plEvent = room.currentState.getStateEvents(EventType.RoomPowerLevels, "");
         let plContent = plEvent?.getContent<RoomPowerLevelsEventContent>() ?? {};
@@ -220,7 +214,7 @@ export default class RolesRoomSettingsTab extends React.Component<IProps> {
     };
 
     private onUserPowerLevelChanged = async (value: number, powerLevelKey: string): Promise<void> => {
-        const client = this.context;
+        const client = this.props.mxClient;
         const room = this.props.room;
         const plEvent = room.currentState.getStateEvents(EventType.RoomPowerLevels, "");
         let plContent = plEvent?.getContent<RoomPowerLevelsEventContent>() ?? {};
@@ -245,7 +239,7 @@ export default class RolesRoomSettingsTab extends React.Component<IProps> {
     };
 
     public render(): React.ReactNode {
-        const client = this.context;
+        const client = this.props.mxClient;
         const room = this.props.room;
         const isSpaceRoom = room.isSpaceRoom();
 
@@ -394,6 +388,7 @@ export default class RolesRoomSettingsTab extends React.Component<IProps> {
                                     member={member}
                                     reason={banEvent?.reason}
                                     by={bannedBy!}
+                                    mxClient={this.props.mxClient}
                                 />
                             );
                         })}
@@ -484,3 +479,5 @@ export default class RolesRoomSettingsTab extends React.Component<IProps> {
         );
     }
 }
+
+export default withMatrixClientHOC(RolesRoomSettingsTab);
diff --git a/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx b/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
index 6ac686e0639..2b27e2a36ba 100644
--- a/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
+++ b/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
@@ -44,14 +44,14 @@ import ErrorDialog from "../../../dialogs/ErrorDialog";
 import SettingsFieldset from "../../SettingsFieldset";
 import ExternalLink from "../../../elements/ExternalLink";
 import PosthogTrackers from "../../../../../PosthogTrackers";
-import MatrixClientContext from "../../../../../contexts/MatrixClientContext";
+import { MatrixClientProps, withMatrixClientHOC } from "../../../../../contexts/MatrixClientContext";
 import { SettingsSection } from "../../shared/SettingsSection";
 import SettingsTab from "../SettingsTab";
 import SdkConfig from "../../../../../SdkConfig";
 import { shouldForceDisableEncryption } from "../../../../../utils/crypto/shouldForceDisableEncryption";
 import { Caption } from "../../../typography/Caption";
 
-interface IProps {
+interface IProps extends MatrixClientProps {
     room: Room;
     closeSettingsFn: () => void;
 }
@@ -64,12 +64,9 @@ interface IState {
     showAdvancedSection: boolean;
 }
 
-export default class SecurityRoomSettingsTab extends React.Component<IProps, IState> {
-    public static contextType = MatrixClientContext;
-    public context!: React.ContextType<typeof MatrixClientContext>;
-
-    public constructor(props: IProps, context: React.ContextType<typeof MatrixClientContext>) {
-        super(props, context);
+class SecurityRoomSettingsTab extends React.Component<IProps, IState> {
+    public constructor(props: IProps) {
+        super(props);
 
         const state = this.props.room.currentState;
 
@@ -85,13 +82,13 @@ export default class SecurityRoomSettingsTab extends React.Component<IProps, ISt
                 HistoryVisibility.Shared,
             ),
             hasAliases: false, // async loaded in componentDidMount
-            encrypted: context.isRoomEncrypted(this.props.room.roomId),
+            encrypted: props.mxClient.isRoomEncrypted(this.props.room.roomId),
             showAdvancedSection: false,
         };
     }
 
     public componentDidMount(): void {
-        this.context.on(RoomStateEvent.Events, this.onStateEvent);
+        this.props.mxClient.on(RoomStateEvent.Events, this.onStateEvent);
         this.hasAliases().then((hasAliases) => this.setState({ hasAliases }));
     }
 
@@ -100,7 +97,7 @@ export default class SecurityRoomSettingsTab extends React.Component<IProps, ISt
     }
 
     public componentWillUnmount(): void {
-        this.context.removeListener(RoomStateEvent.Events, this.onStateEvent);
+        this.props.mxClient.removeListener(RoomStateEvent.Events, this.onStateEvent);
     }
 
     private onStateEvent = (e: MatrixEvent): void => {
@@ -174,7 +171,7 @@ export default class SecurityRoomSettingsTab extends React.Component<IProps, ISt
 
                 const beforeEncrypted = this.state.encrypted;
                 this.setState({ encrypted: true });
-                this.context
+                this.props.mxClient
                     .sendStateEvent(this.props.room.roomId, EventType.RoomEncryption, {
                         algorithm: "m.megolm.v1.aes-sha2",
                     })
@@ -193,7 +190,7 @@ export default class SecurityRoomSettingsTab extends React.Component<IProps, ISt
 
         this.setState({ guestAccess });
 
-        this.context
+        this.props.mxClient
             .sendStateEvent(
                 this.props.room.roomId,
                 EventType.RoomGuestAccess,
@@ -215,7 +212,7 @@ export default class SecurityRoomSettingsTab extends React.Component<IProps, ISt
 
         const [shouldCreate, opts] = await modal.finished;
         if (shouldCreate) {
-            await createRoom(this.context, opts);
+            await createRoom(this.props.mxClient, opts);
         }
         return shouldCreate;
     };
@@ -225,7 +222,7 @@ export default class SecurityRoomSettingsTab extends React.Component<IProps, ISt
         if (beforeHistory === history) return;
 
         this.setState({ history: history });
-        this.context
+        this.props.mxClient
             .sendStateEvent(
                 this.props.room.roomId,
                 EventType.RoomHistoryVisibility,
@@ -245,7 +242,7 @@ export default class SecurityRoomSettingsTab extends React.Component<IProps, ISt
     };
 
     private async hasAliases(): Promise<boolean> {
-        const cli = this.context;
+        const cli = this.props.mxClient;
         const response = await cli.getLocalAliases(this.props.room.roomId);
         const localAliases = response.aliases;
         return Array.isArray(localAliases) && localAliases.length !== 0;
@@ -352,7 +349,7 @@ export default class SecurityRoomSettingsTab extends React.Component<IProps, ISt
             return null;
         }
 
-        const client = this.context;
+        const client = this.props.mxClient;
         const history = this.state.history;
         const state = this.props.room.currentState;
         const canChangeHistory = state?.mayClientSendStateEvent(EventType.RoomHistoryVisibility, client);
@@ -400,7 +397,7 @@ export default class SecurityRoomSettingsTab extends React.Component<IProps, ISt
     };
 
     private renderAdvanced(): JSX.Element {
-        const client = this.context;
+        const client = this.props.mxClient;
         const guestAccess = this.state.guestAccess;
         const state = this.props.room.currentState;
         const canSetGuestAccess = state?.mayClientSendStateEvent(EventType.RoomGuestAccess, client);
@@ -419,7 +416,7 @@ export default class SecurityRoomSettingsTab extends React.Component<IProps, ISt
     }
 
     public render(): React.ReactNode {
-        const client = this.context;
+        const client = this.props.mxClient;
         const room = this.props.room;
         const isEncrypted = this.state.encrypted;
         const hasEncryptionPermission = room.currentState.mayClientSendStateEvent(EventType.RoomEncryption, client);
@@ -473,3 +470,5 @@ export default class SecurityRoomSettingsTab extends React.Component<IProps, ISt
         );
     }
 }
+
+export default withMatrixClientHOC(SecurityRoomSettingsTab);
diff --git a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx
index 9408274e9bb..db6fc050d69 100644
--- a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx
+++ b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx
@@ -33,9 +33,7 @@ import ImageSizePanel from "../../ImageSizePanel";
 import SettingsTab from "../SettingsTab";
 import { SettingsSection } from "../../shared/SettingsSection";
 import SettingsSubsection, { SettingsSubsectionText } from "../../shared/SettingsSubsection";
-import MatrixClientContext from "../../../../../contexts/MatrixClientContext";
-
-interface IProps {}
+import { MatrixClientProps, withMatrixClientHOC } from "../../../../../contexts/MatrixClientContext";
 
 interface IState {
     useBundledEmojiFont: boolean;
@@ -49,15 +47,12 @@ interface IState {
     avatarUrl?: string;
 }
 
-export default class AppearanceUserSettingsTab extends React.Component<IProps, IState> {
-    public static contextType = MatrixClientContext;
-    public context!: React.ContextType<typeof MatrixClientContext>;
-
+class AppearanceUserSettingsTab extends React.Component<MatrixClientProps, IState> {
     private readonly MESSAGE_PREVIEW_TEXT = _t("common|preview_message");
 
     private unmounted = false;
 
-    public constructor(props: IProps) {
+    public constructor(props: MatrixClientProps) {
         super(props);
 
         this.state = {
@@ -71,7 +66,7 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
 
     public async componentDidMount(): Promise<void> {
         // Fetch the current user profile for the message preview
-        const client = this.context;
+        const client = this.props.mxClient;
         const userId = client.getUserId()!;
         const profileInfo = await client.getProfileInfo(userId);
         if (this.unmounted) return;
@@ -174,3 +169,5 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
         );
     }
 }
+
+export default withMatrixClientHOC(AppearanceUserSettingsTab);
diff --git a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.tsx b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.tsx
index 3009c81a17f..5cd96aad05c 100644
--- a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.tsx
+++ b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.tsx
@@ -16,7 +16,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, { ReactNode } from "react";
+import React, { forwardRef, ReactNode } from "react";
 import { SERVICE_TYPES, HTTPError, IThreepid, ThreepidMedium } from "matrix-js-sdk/src/matrix";
 import { logger } from "matrix-js-sdk/src/logger";
 
@@ -61,6 +61,7 @@ import { SDKContext } from "../../../../../contexts/SDKContext";
 
 interface IProps {
     closeSettingsFn: () => void;
+    context: React.ContextType<typeof SDKContext>;
 }
 
 interface IState {
@@ -92,17 +93,13 @@ interface IState {
     canMake3pidChanges: boolean;
 }
 
-export default class GeneralUserSettingsTab extends React.Component<IProps, IState> {
-    public static contextType = SDKContext;
-    public context!: React.ContextType<typeof SDKContext>;
-
+class GeneralUserSettingsTab extends React.Component<IProps, IState> {
     private readonly dispatcherRef: string;
 
-    public constructor(props: IProps, context: React.ContextType<typeof SDKContext>) {
+    public constructor(props: IProps) {
         super(props);
-        this.context = context;
 
-        const cli = this.context.client!;
+        const cli = this.props.context.client!;
 
         this.state = {
             language: languageHandler.getCurrentLanguage(),
@@ -151,7 +148,7 @@ export default class GeneralUserSettingsTab extends React.Component<IProps, ISta
 
     private onAction = (payload: ActionPayload): void => {
         if (payload.action === "id_server_changed") {
-            this.setState({ haveIdServer: Boolean(this.context.client!.getIdentityServerUrl()) });
+            this.setState({ haveIdServer: Boolean(this.props.context.client!.getIdentityServerUrl()) });
             this.getThreepidState();
         }
     };
@@ -165,7 +162,7 @@ export default class GeneralUserSettingsTab extends React.Component<IProps, ISta
     };
 
     private async getCapabilities(): Promise<void> {
-        const cli = this.context.client!;
+        const cli = this.props.context.client!;
 
         const capabilities = await cli.getCapabilities(); // this is cached
         const changePasswordCap = capabilities["m.change_password"];
@@ -175,8 +172,8 @@ export default class GeneralUserSettingsTab extends React.Component<IProps, ISta
         // the enabled flag value.
         const canChangePassword = !changePasswordCap || changePasswordCap["enabled"] !== false;
 
-        await this.context.oidcClientStore.readyPromise; // wait for the store to be ready
-        const externalAccountManagementUrl = this.context.oidcClientStore.accountManagementEndpoint;
+        await this.props.context.oidcClientStore.readyPromise; // wait for the store to be ready
+        const externalAccountManagementUrl = this.props.context.oidcClientStore.accountManagementEndpoint;
         // https://spec.matrix.org/v1.7/client-server-api/#m3pid_changes-capability
         // We support as far back as v1.1 which doesn't have m.3pid_changes
         // so the behaviour for when it is missing has to be assume true
@@ -186,7 +183,7 @@ export default class GeneralUserSettingsTab extends React.Component<IProps, ISta
     }
 
     private async getThreepidState(): Promise<void> {
-        const cli = this.context.client!;
+        const cli = this.props.context.client!;
 
         // Check to see if terms need accepting
         this.checkTerms();
@@ -213,7 +210,7 @@ export default class GeneralUserSettingsTab extends React.Component<IProps, ISta
     private async checkTerms(): Promise<void> {
         // By starting the terms flow we get the logic for checking which terms the user has signed
         // for free. So we might as well use that for our own purposes.
-        const idServerUrl = this.context.client!.getIdentityServerUrl();
+        const idServerUrl = this.props.context.client!.getIdentityServerUrl();
         if (!this.state.haveIdServer || !idServerUrl) {
             this.setState({ idServerHasUnsignedTerms: false });
             return;
@@ -223,7 +220,7 @@ export default class GeneralUserSettingsTab extends React.Component<IProps, ISta
         try {
             const idAccessToken = await authClient.getAccessToken({ check: false });
             await startTermsFlow(
-                this.context.client!,
+                this.props.context.client!,
                 [new Service(SERVICE_TYPES.IS, idServerUrl, idAccessToken!)],
                 (policiesAndServices, agreedUrls, extraClassNames) => {
                     return new Promise((resolve, reject) => {
@@ -573,3 +570,9 @@ export default class GeneralUserSettingsTab extends React.Component<IProps, ISta
         );
     }
 }
+
+export default forwardRef<GeneralUserSettingsTab, Omit<IProps, "context">>((props, ref) => (
+    <SDKContext.Consumer>
+        {(context) => <GeneralUserSettingsTab {...props} context={context} ref={ref} />}
+    </SDKContext.Consumer>
+));
diff --git a/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx b/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx
index c8221b2df47..930a6702476 100644
--- a/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx
+++ b/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx
@@ -29,20 +29,15 @@ import SettingsTab from "../SettingsTab";
 import { SettingsSection } from "../../shared/SettingsSection";
 import SettingsSubsection, { SettingsSubsectionText } from "../../shared/SettingsSubsection";
 import ExternalLink from "../../../elements/ExternalLink";
-import MatrixClientContext from "../../../../../contexts/MatrixClientContext";
-
-interface IProps {}
+import { MatrixClientProps, withMatrixClientHOC } from "../../../../../contexts/MatrixClientContext";
 
 interface IState {
     appVersion: string | null;
     canUpdate: boolean;
 }
 
-export default class HelpUserSettingsTab extends React.Component<IProps, IState> {
-    public static contextType = MatrixClientContext;
-    public context!: React.ContextType<typeof MatrixClientContext>;
-
-    public constructor(props: IProps) {
+class HelpUserSettingsTab extends React.Component<MatrixClientProps, IState> {
+    public constructor(props: MatrixClientProps) {
         super(props);
 
         this.state = {
@@ -69,7 +64,7 @@ export default class HelpUserSettingsTab extends React.Component<IProps, IState>
     private getVersionInfo(): { appVersion: string; cryptoVersion: string } {
         const brand = SdkConfig.get().brand;
         const appVersion = this.state.appVersion || "unknown";
-        const cryptoVersion = this.context.getCrypto()?.getVersion() ?? "<not-enabled>";
+        const cryptoVersion = this.props.mxClient.getCrypto()?.getVersion() ?? "<not-enabled>";
 
         return {
             appVersion: `${_t("setting|help_about|brand_version", { brand })} ${appVersion}`,
@@ -83,8 +78,8 @@ export default class HelpUserSettingsTab extends React.Component<IProps, IState>
         // Dev note: please keep this log line, it's useful when troubleshooting a MatrixClient suddenly
         // stopping in the middle of the logs.
         logger.log("Clear cache & reload clicked");
-        this.context.stopClient();
-        this.context.store.deleteAllData().then(() => {
+        this.props.mxClient.stopClient();
+        this.props.mxClient.store.deleteAllData().then(() => {
             PlatformPeg.get()?.reload();
         });
     };
@@ -285,19 +280,19 @@ export default class HelpUserSettingsTab extends React.Component<IProps, IState>
                             {_t(
                                 "setting|help_about|homeserver",
                                 {
-                                    homeserverUrl: this.context.getHomeserverUrl(),
+                                    homeserverUrl: this.props.mxClient.getHomeserverUrl(),
                                 },
                                 {
                                     code: (sub) => <code>{sub}</code>,
                                 },
                             )}
                         </SettingsSubsectionText>
-                        {this.context.getIdentityServerUrl() && (
+                        {this.props.mxClient.getIdentityServerUrl() && (
                             <SettingsSubsectionText>
                                 {_t(
                                     "setting|help_about|identity_server",
                                     {
-                                        identityServerUrl: this.context.getIdentityServerUrl(),
+                                        identityServerUrl: this.props.mxClient.getIdentityServerUrl(),
                                     },
                                     {
                                         code: (sub) => <code>{sub}</code>,
@@ -311,8 +306,8 @@ export default class HelpUserSettingsTab extends React.Component<IProps, IState>
                                     {_t("common|access_token")}
                                 </summary>
                                 <b>{_t("setting|help_about|access_token_detail")}</b>
-                                <CopyableText getTextToCopy={() => this.context.getAccessToken()}>
-                                    {this.context.getAccessToken()}
+                                <CopyableText getTextToCopy={() => this.props.mxClient.getAccessToken()}>
+                                    {this.props.mxClient.getAccessToken()}
                                 </CopyableText>
                             </details>
                         </SettingsSubsectionText>
@@ -325,3 +320,5 @@ export default class HelpUserSettingsTab extends React.Component<IProps, IState>
         );
     }
 }
+
+export default withMatrixClientHOC(HelpUserSettingsTab);
diff --git a/src/components/views/settings/tabs/user/VoiceUserSettingsTab.tsx b/src/components/views/settings/tabs/user/VoiceUserSettingsTab.tsx
index c75539025a4..37a97e06827 100644
--- a/src/components/views/settings/tabs/user/VoiceUserSettingsTab.tsx
+++ b/src/components/views/settings/tabs/user/VoiceUserSettingsTab.tsx
@@ -30,7 +30,7 @@ import { requestMediaPermissions } from "../../../../../utils/media/requestMedia
 import SettingsTab from "../SettingsTab";
 import { SettingsSection } from "../../shared/SettingsSection";
 import SettingsSubsection from "../../shared/SettingsSubsection";
-import MatrixClientContext from "../../../../../contexts/MatrixClientContext";
+import { MatrixClientProps, withMatrixClientHOC } from "../../../../../contexts/MatrixClientContext";
 
 interface IState {
     mediaDevices: IMediaDevices | null;
@@ -57,11 +57,8 @@ const mapDeviceKindToHandlerValue = (deviceKind: MediaDeviceKindEnum): string |
     }
 };
 
-export default class VoiceUserSettingsTab extends React.Component<{}, IState> {
-    public static contextType = MatrixClientContext;
-    public context!: React.ContextType<typeof MatrixClientContext>;
-
-    public constructor(props: {}) {
+class VoiceUserSettingsTab extends React.Component<MatrixClientProps, IState> {
+    public constructor(props: MatrixClientProps) {
         super(props);
 
         this.state = {
@@ -117,11 +114,11 @@ export default class VoiceUserSettingsTab extends React.Component<{}, IState> {
     };
 
     private changeWebRtcMethod = (p2p: boolean): void => {
-        this.context.setForceTURN(!p2p);
+        this.props.mxClient.setForceTURN(!p2p);
     };
 
     private changeFallbackICEServerAllowed = (allow: boolean): void => {
-        this.context.setFallbackICEServerAllowed(allow);
+        this.props.mxClient.setFallbackICEServerAllowed(allow);
     };
 
     private renderDeviceOptions(devices: Array<MediaDeviceInfo>, category: MediaDeviceKindEnum): Array<JSX.Element> {
@@ -242,3 +239,5 @@ export default class VoiceUserSettingsTab extends React.Component<{}, IState> {
         );
     }
 }
+
+export default withMatrixClientHOC(VoiceUserSettingsTab);
diff --git a/src/components/views/spaces/SpaceCreateMenu.tsx b/src/components/views/spaces/SpaceCreateMenu.tsx
index 2ded20912d2..8aeeecc55c0 100644
--- a/src/components/views/spaces/SpaceCreateMenu.tsx
+++ b/src/components/views/spaces/SpaceCreateMenu.tsx
@@ -46,7 +46,7 @@ import SpaceBasicSettings, { SpaceAvatar } from "./SpaceBasicSettings";
 import AccessibleButton, { ButtonEvent } from "../elements/AccessibleButton";
 import Field from "../elements/Field";
 import withValidation from "../elements/Validation";
-import RoomAliasField from "../elements/RoomAliasField";
+import RoomAliasField, { RoomAliasField as RoomAliasFieldClass } from "../elements/RoomAliasField";
 import { getKeyBindingsManager } from "../../../KeyBindingsManager";
 import { KeyBindingAction } from "../../../accessibility/KeyboardShortcuts";
 import defaultDispatcher from "../../../dispatcher/dispatcher";
@@ -128,7 +128,7 @@ interface ISpaceCreateFormProps extends BProps {
     busy: boolean;
     alias: string;
     nameFieldRef: RefObject<Field>;
-    aliasFieldRef: RefObject<RoomAliasField>;
+    aliasFieldRef: RefObject<RoomAliasFieldClass>;
     showAliasField?: boolean;
     children?: ReactNode;
     onSubmit(e: SyntheticEvent): void;
@@ -225,7 +225,7 @@ const SpaceCreateMenu: React.FC<{
     const [name, setName] = useState("");
     const spaceNameField = useRef<Field>(null);
     const [alias, setAlias] = useState("");
-    const spaceAliasField = useRef<RoomAliasField>(null);
+    const spaceAliasField = useRef<RoomAliasFieldClass>(null);
     const [avatar, setAvatar] = useState<File | undefined>(undefined);
     const [topic, setTopic] = useState<string>("");
 
diff --git a/src/components/views/spaces/SpaceTreeLevel.tsx b/src/components/views/spaces/SpaceTreeLevel.tsx
index d6543300254..d858f0533ed 100644
--- a/src/components/views/spaces/SpaceTreeLevel.tsx
+++ b/src/components/views/spaces/SpaceTreeLevel.tsx
@@ -38,7 +38,7 @@ import defaultDispatcher from "../../../dispatcher/dispatcher";
 import { Action } from "../../../dispatcher/actions";
 import { ContextMenuTooltipButton } from "../../../accessibility/context_menu/ContextMenuTooltipButton";
 import { toRightOf, useContextMenu } from "../../structures/ContextMenu";
-import MatrixClientContext from "../../../contexts/MatrixClientContext";
+import MatrixClientContext, { withMatrixClientHOC } from "../../../contexts/MatrixClientContext";
 import AccessibleButton, { ButtonEvent } from "../elements/AccessibleButton";
 import { StaticNotificationState } from "../../../stores/notifications/StaticNotificationState";
 import { NotificationLevel } from "../../../stores/notifications/NotificationLevel";
@@ -190,6 +190,7 @@ interface IItemProps extends InputHTMLAttributes<HTMLLIElement> {
     parents?: Set<string>;
     innerRef?: LegacyRef<HTMLLIElement>;
     dragHandleProps?: DraggableProvidedDragHandleProps | null;
+    mxClient: React.ContextType<typeof MatrixClientContext>;
 }
 
 interface IItemState {
@@ -198,9 +199,7 @@ interface IItemState {
     childSpaces: Room[];
 }
 
-export class SpaceItem extends React.PureComponent<IItemProps, IItemState> {
-    public static contextType = MatrixClientContext;
-
+class InnerSpaceItem extends React.PureComponent<IItemProps, IItemState> {
     private buttonRef = createRef<HTMLDivElement>();
 
     public constructor(props: IItemProps) {
@@ -392,6 +391,8 @@ export class SpaceItem extends React.PureComponent<IItemProps, IItemState> {
     }
 }
 
+export const SpaceItem = withMatrixClientHOC(InnerSpaceItem);
+
 interface ITreeLevelProps {
     spaces: Room[];
     activeSpaces: SpaceKey[];
diff --git a/src/contexts/MatrixClientContext.tsx b/src/contexts/MatrixClientContext.tsx
index 273bf773d31..fb4d3aeffd1 100644
--- a/src/contexts/MatrixClientContext.tsx
+++ b/src/contexts/MatrixClientContext.tsx
@@ -32,22 +32,24 @@ export function useMatrixClientContext(): MatrixClient {
     return useContext(MatrixClientContext);
 }
 
-const matrixHOC = <ComposedComponentProps extends {}>(
+/**
+ * A higher order component that injects the MatrixClient into props.mxClient of the wrapped component.
+ * Preferred over using `static contextType` as the types for this are quite broken in React 17.
+ * Inherently no different to wrapping in MatrixClientContext.Consumer but saves a lot of boilerplate.
+ * @param ComposedComponent the ComponentClass you wish to wrap in the HOC
+ * @returns a new component that takes the same props as the original component, but with an additional mxClient prop
+ */
+export const withMatrixClientHOC = <ComposedComponentProps extends {}>(
     ComposedComponent: ComponentClass<ComposedComponentProps>,
 ): ((
     props: Omit<ComposedComponentProps, "mxClient"> & React.RefAttributes<InstanceType<typeof ComposedComponent>>,
 ) => React.ReactElement | null) => {
     type ComposedComponentInstance = InstanceType<typeof ComposedComponent>;
 
-    // eslint-disable-next-line react-hooks/rules-of-hooks
-
-    const TypedComponent = ComposedComponent;
-
     return forwardRef<ComposedComponentInstance, Omit<ComposedComponentProps, "mxClient">>((props, ref) => {
         const client = useContext(MatrixClientContext);
 
         // @ts-ignore
-        return <TypedComponent ref={ref} {...props} mxClient={client} />;
+        return <ComposedComponent ref={ref} {...props} mxClient={client} />;
     });
 };
-export const withMatrixClientHOC = matrixHOC;
diff --git a/src/editor/autocomplete.ts b/src/editor/autocomplete.ts
index 3aed32d91fd..6e92196faf3 100644
--- a/src/editor/autocomplete.ts
+++ b/src/editor/autocomplete.ts
@@ -28,7 +28,7 @@ export interface ICallback {
 }
 
 export type UpdateCallback = (data: ICallback) => void;
-export type GetAutocompleterComponent = () => Autocomplete | null;
+export type GetAutocompleterComponent = () => React.ComponentRef<typeof Autocomplete> | null;
 export type UpdateQuery = (test: string) => Promise<void>;
 
 export default class AutocompleteWrapperModel {
diff --git a/src/events/EventTileFactory.tsx b/src/events/EventTileFactory.tsx
index 88ebb0a5600..d5c427a0e98 100644
--- a/src/events/EventTileFactory.tsx
+++ b/src/events/EventTileFactory.tsx
@@ -56,6 +56,7 @@ import {
     shouldDisplayAsVoiceBroadcastStoppedText,
     VoiceBroadcastChunkEventType,
 } from "../voice-broadcast";
+import { IBodyProps } from "../components/views/messages/IBodyProps";
 
 // Subset of EventTile's IProps plus some mixins
 export interface EventTileTypeProps
@@ -78,11 +79,11 @@ export interface EventTileTypeProps
     ref?: React.RefObject<any>; // `any` because it's effectively impossible to convince TS of a reasonable type
     timestamp?: JSX.Element;
     maxImageHeight?: number; // pixels
-    overrideBodyTypes?: Record<string, typeof React.Component>;
-    overrideEventTypes?: Record<string, typeof React.Component>;
+    overrideBodyTypes?: Record<string, React.ComponentType<IBodyProps>>;
+    overrideEventTypes?: Record<string, React.ComponentType<IBodyProps>>;
 }
 
-type FactoryProps = Omit<EventTileTypeProps, "ref">;
+type FactoryProps = EventTileTypeProps;
 type Factory<X = FactoryProps> = (ref: Optional<React.RefObject<any>>, props: X) => JSX.Element;
 
 export const MessageEventFactory: Factory = (ref, props) => <MessageEvent ref={ref} {...props} />;
diff --git a/src/stores/room-list/previews/PollStartEventPreview.ts b/src/stores/room-list/previews/PollStartEventPreview.ts
index 793a8230716..fe956542079 100644
--- a/src/stores/room-list/previews/PollStartEventPreview.ts
+++ b/src/stores/room-list/previews/PollStartEventPreview.ts
@@ -22,12 +22,8 @@ import { IPreview } from "./IPreview";
 import { TagID } from "../models";
 import { _t, sanitizeForTranslation } from "../../../languageHandler";
 import { getSenderName, isSelf, shouldPrefixMessagesIn } from "./utils";
-import MatrixClientContext from "../../../contexts/MatrixClientContext";
 
 export class PollStartEventPreview implements IPreview {
-    public static contextType = MatrixClientContext;
-    public context!: React.ContextType<typeof MatrixClientContext>;
-
     public getTextFor(event: MatrixEvent, tagId?: TagID, isThread?: boolean): string | null {
         let eventContent = event.getContent();
 
diff --git a/src/stores/widgets/StopGapWidget.ts b/src/stores/widgets/StopGapWidget.ts
index 36ade5d5947..4775945dbcb 100644
--- a/src/stores/widgets/StopGapWidget.ts
+++ b/src/stores/widgets/StopGapWidget.ts
@@ -71,11 +71,11 @@ interface IAppTileProps {
     // Note: these are only the props we care about
     app: IApp | IWidget;
     room?: Room; // without a room it is a user widget
-    userId: string;
-    creatorUserId: string;
-    waitForIframeLoad: boolean;
+    userId?: string;
+    creatorUserId?: string;
+    waitForIframeLoad?: boolean;
     whitelistCapabilities?: string[];
-    userWidget: boolean;
+    userWidget?: boolean;
     stickyPromise?: () => Promise<void>;
 }
 
diff --git a/test/components/structures/RoomView-test.tsx b/test/components/structures/RoomView-test.tsx
index 31f5c896aec..166c11f5b5d 100644
--- a/test/components/structures/RoomView-test.tsx
+++ b/test/components/structures/RoomView-test.tsx
@@ -53,7 +53,7 @@ import { MatrixClientPeg } from "../../../src/MatrixClientPeg";
 import { Action } from "../../../src/dispatcher/actions";
 import dis, { defaultDispatcher } from "../../../src/dispatcher/dispatcher";
 import { ViewRoomPayload } from "../../../src/dispatcher/payloads/ViewRoomPayload";
-import { RoomView as _RoomView } from "../../../src/components/structures/RoomView";
+import _RoomView from "../../../src/components/structures/RoomView";
 import ResizeNotifier from "../../../src/utils/ResizeNotifier";
 import SettingsStore from "../../../src/settings/SettingsStore";
 import { SettingLevel } from "../../../src/settings/SettingLevel";
@@ -112,7 +112,7 @@ describe("RoomView", () => {
         jest.clearAllMocks();
     });
 
-    const mountRoomView = async (ref?: RefObject<_RoomView>): Promise<RenderResult> => {
+    const mountRoomView = async (ref?: RefObject<React.ComponentRef<typeof _RoomView>>): Promise<RenderResult> => {
         if (stores.roomViewStore.getRoomId() !== room.roomId) {
             const switchedRoom = new Promise<void>((resolve) => {
                 const subFn = () => {
@@ -185,8 +185,8 @@ describe("RoomView", () => {
         await flushPromises();
         return roomView;
     };
-    const getRoomViewInstance = async (): Promise<_RoomView> => {
-        const ref = createRef<_RoomView>();
+    const getRoomViewInstance = async (): Promise<React.ComponentRef<typeof _RoomView>> => {
+        const ref = createRef<React.ComponentRef<typeof _RoomView>>();
         await mountRoomView(ref);
         return ref.current!;
     };
@@ -197,7 +197,7 @@ describe("RoomView", () => {
     });
 
     describe("when there is an old room", () => {
-        let instance: _RoomView;
+        let instance: React.ComponentRef<typeof _RoomView>;
         let oldRoom: Room;
 
         beforeEach(async () => {
@@ -596,7 +596,7 @@ describe("RoomView", () => {
 
         const eventMapper = (obj: Partial<IEvent>) => new MatrixEvent(obj);
 
-        const roomViewRef = createRef<_RoomView>();
+        const roomViewRef = createRef<React.ComponentRef<typeof _RoomView>>();
         const { container, getByText, findByLabelText } = await mountRoomView(roomViewRef);
         // @ts-ignore - triggering a search organically is a lot of work
         roomViewRef.current!.setState({
@@ -657,7 +657,7 @@ describe("RoomView", () => {
 
         const eventMapper = (obj: Partial<IEvent>) => new MatrixEvent(obj);
 
-        const roomViewRef = createRef<_RoomView>();
+        const roomViewRef = createRef<React.ComponentRef<typeof _RoomView>>();
         const { container, getByText, findByLabelText } = await mountRoomView(roomViewRef);
         // @ts-ignore - triggering a search organically is a lot of work
         roomViewRef.current!.setState({
diff --git a/test/components/structures/TimelinePanel-test.tsx b/test/components/structures/TimelinePanel-test.tsx
index 0396ea68a44..9992c772e87 100644
--- a/test/components/structures/TimelinePanel-test.tsx
+++ b/test/components/structures/TimelinePanel-test.tsx
@@ -40,7 +40,7 @@ import React, { createRef } from "react";
 import { Mocked, mocked } from "jest-mock";
 import { forEachRight } from "lodash";
 
-import TimelinePanel from "../../../src/components/structures/TimelinePanel";
+import TimelinePanel, { TimelinePanel as TimelinePanelClass } from "../../../src/components/structures/TimelinePanel";
 import MatrixClientContext from "../../../src/contexts/MatrixClientContext";
 import { MatrixClientPeg } from "../../../src/MatrixClientPeg";
 import { isCallEvent } from "../../../src/components/structures/LegacyCallEventGrouper";
@@ -77,7 +77,7 @@ const mkTimeline = (room: Room, events: MatrixEvent[]): [EventTimeline, EventTim
     return [timeline, timelineSet];
 };
 
-const getProps = (room: Room, events: MatrixEvent[]): TimelinePanel["props"] => {
+const getProps = (room: Room, events: MatrixEvent[]): React.ComponentProps<typeof TimelinePanel> => {
     const [, timelineSet] = mkTimeline(room, events);
 
     return {
@@ -184,7 +184,7 @@ describe("TimelinePanel", () => {
         const roomId = "#room:example.com";
         let room: Room;
         let timelineSet: EventTimelineSet;
-        let timelinePanel: TimelinePanel;
+        let timelinePanel: React.ComponentRef<typeof TimelinePanel>;
 
         const ev1 = new MatrixEvent({
             event_id: "ev1",
@@ -203,7 +203,7 @@ describe("TimelinePanel", () => {
         });
 
         const renderTimelinePanel = async (): Promise<void> => {
-            const ref = createRef<TimelinePanel>();
+            const ref = createRef<React.ComponentRef<typeof TimelinePanel>>();
             render(
                 <TimelinePanel
                     timelineSet={timelineSet}
@@ -239,7 +239,7 @@ describe("TimelinePanel", () => {
         });
 
         afterEach(() => {
-            TimelinePanel.roomReadMarkerTsMap = {};
+            TimelinePanelClass.roomReadMarkerTsMap = {};
         });
 
         it("when there is no event, it should not send any receipt", async () => {
diff --git a/test/components/views/messages/ReactionsRowButton-test.tsx b/test/components/views/messages/ReactionsRowButton-test.tsx
index b3ec6313d12..eb499b6330a 100644
--- a/test/components/views/messages/ReactionsRowButton-test.tsx
+++ b/test/components/views/messages/ReactionsRowButton-test.tsx
@@ -20,7 +20,7 @@ import { render } from "@testing-library/react";
 
 import MatrixClientContext from "../../../../src/contexts/MatrixClientContext";
 import { getMockClientWithEventEmitter } from "../../../test-utils";
-import ReactionsRowButton, { IProps } from "../../../../src/components/views/messages/ReactionsRowButton";
+import ReactionsRowButton from "../../../../src/components/views/messages/ReactionsRowButton";
 
 describe("ReactionsRowButton", () => {
     const userId = "@alice:server";
@@ -31,7 +31,7 @@ describe("ReactionsRowButton", () => {
     });
     const room = new Room(roomId, mockClient, userId);
 
-    const createProps = (relationContent: IContent): IProps => ({
+    const createProps = (relationContent: IContent): React.ComponentProps<typeof ReactionsRowButton> => ({
         mxEvent: new MatrixEvent({
             room_id: roomId,
             event_id: "$test:example.com",
diff --git a/test/components/views/rooms/LegacyRoomHeader-test.tsx b/test/components/views/rooms/LegacyRoomHeader-test.tsx
index c01d749eeab..dd648c9f5f0 100644
--- a/test/components/views/rooms/LegacyRoomHeader-test.tsx
+++ b/test/components/views/rooms/LegacyRoomHeader-test.tsx
@@ -50,7 +50,7 @@ import {
 } from "../../../test-utils";
 import { MatrixClientPeg } from "../../../../src/MatrixClientPeg";
 import DMRoomMap from "../../../../src/utils/DMRoomMap";
-import RoomHeader, { IProps as RoomHeaderProps } from "../../../../src/components/views/rooms/LegacyRoomHeader";
+import RoomHeader from "../../../../src/components/views/rooms/LegacyRoomHeader";
 import { SearchScope } from "../../../../src/components/views/rooms/SearchBar";
 import { E2EStatus } from "../../../../src/utils/ShieldUtils";
 import { IRoomState } from "../../../../src/components/structures/RoomView";
@@ -201,7 +201,10 @@ describe("LegacyRoomHeader", () => {
         WidgetMessagingStore.instance.stopMessaging(widget, call.roomId);
     };
 
-    const renderHeader = (props: Partial<RoomHeaderProps> = {}, roomContext: Partial<IRoomState> = {}) => {
+    const renderHeader = (
+        props: Partial<React.ComponentProps<typeof RoomHeader>> = {},
+        roomContext: Partial<IRoomState> = {},
+    ) => {
         render(
             <RoomContext.Provider value={{ ...roomContext, room } as IRoomState}>
                 <RoomHeader
@@ -843,7 +846,7 @@ function createRoom(info: IRoomCreationInfo) {
 }
 
 function mountHeader(room: Room, propsOverride = {}, roomContext?: Partial<IRoomState>): RenderResult {
-    const props: RoomHeaderProps = {
+    const props: React.ComponentProps<typeof RoomHeader> = {
         room,
         inRoom: true,
         onSearchClick: () => {},
diff --git a/test/components/views/rooms/MemberList-test.tsx b/test/components/views/rooms/MemberList-test.tsx
index 648fa712304..9098ee1e29c 100644
--- a/test/components/views/rooms/MemberList-test.tsx
+++ b/test/components/views/rooms/MemberList-test.tsx
@@ -59,7 +59,7 @@ describe("MemberList", () => {
     let client: MatrixClient;
     let root: RenderResult;
     let memberListRoom: Room;
-    let memberList: MemberList;
+    let memberList: React.ComponentRef<typeof MemberList>;
 
     let adminUsers: RoomMember[] = [];
     let moderatorUsers: RoomMember[] = [];
@@ -214,7 +214,7 @@ describe("MemberList", () => {
             memberListRoom.currentState.members[member.userId] = member;
         }
 
-        const gatherWrappedRef = (r: MemberList) => {
+        const gatherWrappedRef = (r: React.ComponentRef<typeof MemberList>) => {
             memberList = r;
         };
         const context = new TestSdkContext();
diff --git a/test/components/views/rooms/VoiceRecordComposerTile-test.tsx b/test/components/views/rooms/VoiceRecordComposerTile-test.tsx
index 72456f3c190..e5ac821b6c4 100644
--- a/test/components/views/rooms/VoiceRecordComposerTile-test.tsx
+++ b/test/components/views/rooms/VoiceRecordComposerTile-test.tsx
@@ -43,7 +43,7 @@ jest.mock("../../../../src/stores/VoiceRecordingStore", () => ({
 }));
 
 describe("<VoiceRecordComposerTile/>", () => {
-    let voiceRecordComposerTile: RefObject<VoiceRecordComposerTile>;
+    let voiceRecordComposerTile: RefObject<React.ComponentRef<typeof VoiceRecordComposerTile>>;
     let mockRecorder: VoiceMessageRecording;
     let mockUpload: IUpload;
     let mockClient: MatrixClient;
diff --git a/test/components/views/rooms/wysiwyg_composer/components/WysiwygAutocomplete-test.tsx b/test/components/views/rooms/wysiwyg_composer/components/WysiwygAutocomplete-test.tsx
index 0b20cc61b21..310b0d547c5 100644
--- a/test/components/views/rooms/wysiwyg_composer/components/WysiwygAutocomplete-test.tsx
+++ b/test/components/views/rooms/wysiwyg_composer/components/WysiwygAutocomplete-test.tsx
@@ -60,7 +60,7 @@ describe("WysiwygAutocomplete", () => {
         jest.restoreAllMocks();
     });
 
-    const autocompleteRef = createRef<Autocomplete>();
+    const autocompleteRef = createRef<React.ComponentRef<typeof Autocomplete>>();
     const getCompletionsSpy = jest.spyOn(Autocompleter.prototype, "getCompletions").mockResolvedValue([
         {
             completions: mockCompletion,
diff --git a/test/components/views/settings/tabs/room/NotificationSettingsTab-test.tsx b/test/components/views/settings/tabs/room/NotificationSettingsTab-test.tsx
index 0ed688b032f..eb619c4b885 100644
--- a/test/components/views/settings/tabs/room/NotificationSettingsTab-test.tsx
+++ b/test/components/views/settings/tabs/room/NotificationSettingsTab-test.tsx
@@ -19,15 +19,17 @@ import { render, RenderResult, screen } from "@testing-library/react";
 import { MatrixClient } from "matrix-js-sdk/src/matrix";
 import userEvent from "@testing-library/user-event";
 
-import NotificationSettingsTab from "../../../../../../src/components/views/settings/tabs/room/NotificationSettingsTab";
-import { mkStubRoom, stubClient } from "../../../../../test-utils";
+import _NotificationSettingsTab from "../../../../../../src/components/views/settings/tabs/room/NotificationSettingsTab";
+import { mkStubRoom, stubClient, wrapInMatrixClientContext } from "../../../../../test-utils";
 import { MatrixClientPeg } from "../../../../../../src/MatrixClientPeg";
 import { EchoChamber } from "../../../../../../src/stores/local-echo/EchoChamber";
 import { RoomEchoChamber } from "../../../../../../src/stores/local-echo/RoomEchoChamber";
 import SettingsStore from "../../../../../../src/settings/SettingsStore";
 import { SettingLevel } from "../../../../../../src/settings/SettingLevel";
 
-describe("NotificatinSettingsTab", () => {
+const NotificationSettingsTab = wrapInMatrixClientContext(_NotificationSettingsTab);
+
+describe("NotificationSettingsTab", () => {
     const roomId = "!room:example.com";
     let cli: MatrixClient;
     let roomProps: RoomEchoChamber;
@@ -41,8 +43,6 @@ describe("NotificatinSettingsTab", () => {
         cli = MatrixClientPeg.safeGet();
         const room = mkStubRoom(roomId, "test room", cli);
         roomProps = EchoChamber.forRoom(room);
-
-        NotificationSettingsTab.contextType = React.createContext<MatrixClient>(cli);
     });
 
     it("should prevent »Settings« link click from bubbling up to radio buttons", async () => {