diff --git a/src/components/views/rooms/wysiwyg_composer/hooks/useEditing.ts b/src/components/views/rooms/wysiwyg_composer/hooks/useEditing.ts
index c5648e7e654..862b7495026 100644
--- a/src/components/views/rooms/wysiwyg_composer/hooks/useEditing.ts
+++ b/src/components/views/rooms/wysiwyg_composer/hooks/useEditing.ts
@@ -46,7 +46,8 @@ export function useEditing(
     );
 
     const editMessageMemoized = useCallback(
-        () => content !== undefined && editMessage(content, { roomContext, mxClient, editorStateTransfer }),
+        () =>
+            !!mxClient && content !== undefined && editMessage(content, { roomContext, mxClient, editorStateTransfer }),
         [content, roomContext, mxClient, editorStateTransfer],
     );
 
diff --git a/src/components/views/rooms/wysiwyg_composer/hooks/useInitialContent.ts b/src/components/views/rooms/wysiwyg_composer/hooks/useInitialContent.ts
index f4612a097e1..1bed0f0c74d 100644
--- a/src/components/views/rooms/wysiwyg_composer/hooks/useInitialContent.ts
+++ b/src/components/views/rooms/wysiwyg_composer/hooks/useInitialContent.ts
@@ -69,7 +69,7 @@ export function useInitialContent(editorStateTransfer: EditorStateTransfer): str
     const mxClient = useMatrixClientContext();
 
     return useMemo<string | undefined>(() => {
-        if (editorStateTransfer && roomContext.room) {
+        if (editorStateTransfer && roomContext.room && mxClient) {
             return parseEditorStateTransfer(editorStateTransfer, roomContext.room, mxClient);
         }
     }, [editorStateTransfer, roomContext, mxClient]);
diff --git a/src/contexts/MatrixClientContext.tsx b/src/contexts/MatrixClientContext.tsx
index e5d7ca304cc..4c02f066b6b 100644
--- a/src/contexts/MatrixClientContext.tsx
+++ b/src/contexts/MatrixClientContext.tsx
@@ -25,7 +25,7 @@ import React, {
 } from "react";
 import { MatrixClient } from "matrix-js-sdk/src/client";
 
-const MatrixClientContext = createContext<MatrixClient>(undefined);
+const MatrixClientContext = createContext<MatrixClient | undefined>(undefined);
 MatrixClientContext.displayName = "MatrixClientContext";
 export default MatrixClientContext;
 
@@ -33,7 +33,7 @@ export interface MatrixClientProps {
     mxClient: MatrixClient;
 }
 
-export function useMatrixClientContext(): MatrixClient {
+export function useMatrixClientContext(): MatrixClient | undefined {
     return useContext(MatrixClientContext);
 }
 
diff --git a/src/contexts/SDKContext.ts b/src/contexts/SDKContext.ts
index 79a509f20b9..82b47d09c4e 100644
--- a/src/contexts/SDKContext.ts
+++ b/src/contexts/SDKContext.ts
@@ -38,7 +38,7 @@ import {
     VoiceBroadcastRecordingsStore,
 } from "../voice-broadcast";
 
-export const SDKContext = createContext<SdkContextClass>(undefined);
+export const SDKContext = createContext<SdkContextClass | undefined>(undefined);
 SDKContext.displayName = "SDKContext";
 
 /**