diff --git a/web/src/App.tsx b/web/src/App.tsx
index 0aaab7d..5041fab 100644
--- a/web/src/App.tsx
+++ b/web/src/App.tsx
@@ -17,7 +17,7 @@ import { useEffect } from "react"
 import { ScaleLoader } from "react-spinners"
 import Client from "./api/client.ts"
 import WSClient from "./api/wsclient.ts"
-import { ClientContext } from "./ui/ClientContext.ts"
+import ClientContext from "./ui/ClientContext.ts"
 import MainScreen from "./ui/MainScreen.tsx"
 import { LoginScreen, VerificationScreen } from "./ui/login"
 import { LightboxWrapper } from "./ui/modal/Lightbox.tsx"
diff --git a/web/src/ui/ClientContext.ts b/web/src/ui/ClientContext.ts
index 3b87d9c..ec09ad4 100644
--- a/web/src/ui/ClientContext.ts
+++ b/web/src/ui/ClientContext.ts
@@ -16,4 +16,6 @@
 import { createContext } from "react"
 import type Client from "../api/client.ts"
 
-export const ClientContext = createContext<Client | null>(null)
+const ClientContext = createContext<Client | null>(null)
+
+export default ClientContext
diff --git a/web/src/ui/MainScreen.tsx b/web/src/ui/MainScreen.tsx
index 50ce52f..9fdfbe0 100644
--- a/web/src/ui/MainScreen.tsx
+++ b/web/src/ui/MainScreen.tsx
@@ -15,7 +15,7 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 import { use, useCallback, useLayoutEffect, useState } from "react"
 import type { RoomID } from "@/api/types"
-import { ClientContext } from "./ClientContext.ts"
+import ClientContext from "./ClientContext.ts"
 import RoomView from "./RoomView.tsx"
 import RoomList from "./roomlist/RoomList.tsx"
 import "./MainScreen.css"
diff --git a/web/src/ui/composer/Autocompleter.tsx b/web/src/ui/composer/Autocompleter.tsx
index b2cad93..7bc31ee 100644
--- a/web/src/ui/composer/Autocompleter.tsx
+++ b/web/src/ui/composer/Autocompleter.tsx
@@ -18,7 +18,7 @@ import { getAvatarURL, getMediaURL } from "@/api/media.ts"
 import { RoomStateStore, useCustomEmojis } from "@/api/statestore"
 import { Emoji, emojiToMarkdown, useSortedAndFilteredEmojis } from "@/util/emoji"
 import useEvent from "@/util/useEvent.ts"
-import { ClientContext } from "../ClientContext.ts"
+import ClientContext from "../ClientContext.ts"
 import type { ComposerState } from "./MessageComposer.tsx"
 import { AutocompleteUser, useFilteredMembers } from "./userautocomplete.ts"
 import "./Autocompleter.css"
diff --git a/web/src/ui/composer/MessageComposer.tsx b/web/src/ui/composer/MessageComposer.tsx
index 26e51e4..e3f28d8 100644
--- a/web/src/ui/composer/MessageComposer.tsx
+++ b/web/src/ui/composer/MessageComposer.tsx
@@ -27,7 +27,7 @@ import type {
 } from "@/api/types"
 import { PartialEmoji, emojiToMarkdown } from "@/util/emoji"
 import useEvent from "@/util/useEvent.ts"
-import { ClientContext } from "../ClientContext.ts"
+import ClientContext from "../ClientContext.ts"
 import EmojiPicker from "../emojipicker/EmojiPicker.tsx"
 import { ModalContext } from "../modal/Modal.tsx"
 import { useRoomContext } from "../roomcontext.ts"
diff --git a/web/src/ui/emojipicker/EmojiGroup.tsx b/web/src/ui/emojipicker/EmojiGroup.tsx
index dc39da0..f99bcde 100644
--- a/web/src/ui/emojipicker/EmojiGroup.tsx
+++ b/web/src/ui/emojipicker/EmojiGroup.tsx
@@ -18,7 +18,7 @@ import { stringToRoomStateGUID } from "@/api/types"
 import useContentVisibility from "@/util/contentvisibility.ts"
 import { CATEGORY_FREQUENTLY_USED, CustomEmojiPack, Emoji, PartialEmoji, categories } from "@/util/emoji"
 import useEvent from "@/util/useEvent.ts"
-import { ClientContext } from "../ClientContext.ts"
+import ClientContext from "../ClientContext.ts"
 import renderEmoji from "./renderEmoji.tsx"
 
 interface EmojiGroupProps {
diff --git a/web/src/ui/emojipicker/EmojiPicker.tsx b/web/src/ui/emojipicker/EmojiPicker.tsx
index 0667f70..6334c44 100644
--- a/web/src/ui/emojipicker/EmojiPicker.tsx
+++ b/web/src/ui/emojipicker/EmojiPicker.tsx
@@ -19,7 +19,7 @@ import { RoomStateStore, useCustomEmojis } from "@/api/statestore"
 import { roomStateGUIDToString } from "@/api/types"
 import { CATEGORY_FREQUENTLY_USED, Emoji, PartialEmoji, categories, useFilteredEmojis } from "@/util/emoji"
 import useEvent from "@/util/useEvent.ts"
-import { ClientContext } from "../ClientContext.ts"
+import ClientContext from "../ClientContext.ts"
 import { ModalCloseContext } from "../modal/Modal.tsx"
 import { EmojiGroup } from "./EmojiGroup.tsx"
 import renderEmoji from "./renderEmoji.tsx"
diff --git a/web/src/ui/roomlist/Entry.tsx b/web/src/ui/roomlist/Entry.tsx
index 73c057a..55e6866 100644
--- a/web/src/ui/roomlist/Entry.tsx
+++ b/web/src/ui/roomlist/Entry.tsx
@@ -18,7 +18,7 @@ import { getAvatarURL } from "@/api/media.ts"
 import type { RoomListEntry } from "@/api/statestore"
 import type { MemDBEvent, MemberEventContent } from "@/api/types"
 import useContentVisibility from "@/util/contentvisibility.ts"
-import { ClientContext } from "../ClientContext.ts"
+import ClientContext from "../ClientContext.ts"
 
 export interface RoomListEntryProps {
 	room: RoomListEntry
diff --git a/web/src/ui/roomlist/RoomList.tsx b/web/src/ui/roomlist/RoomList.tsx
index d9933fe..d7794a3 100644
--- a/web/src/ui/roomlist/RoomList.tsx
+++ b/web/src/ui/roomlist/RoomList.tsx
@@ -17,7 +17,7 @@ import React, { use, useCallback, useRef, useState } from "react"
 import type { RoomID } from "@/api/types"
 import { useNonNullEventAsState } from "@/util/eventdispatcher.ts"
 import toSearchableString from "@/util/searchablestring.ts"
-import { ClientContext } from "../ClientContext.ts"
+import ClientContext from "../ClientContext.ts"
 import Entry from "./Entry.tsx"
 import "./RoomList.css"
 
diff --git a/web/src/ui/timeline/ReplyBody.tsx b/web/src/ui/timeline/ReplyBody.tsx
index cc97086..2e920a5 100644
--- a/web/src/ui/timeline/ReplyBody.tsx
+++ b/web/src/ui/timeline/ReplyBody.tsx
@@ -17,7 +17,7 @@ import { use } from "react"
 import { getAvatarURL } from "@/api/media.ts"
 import { RoomStateStore, useRoomEvent, useRoomState } from "@/api/statestore"
 import type { EventID, MemDBEvent, MemberEventContent } from "@/api/types"
-import { ClientContext } from "../ClientContext.ts"
+import ClientContext from "../ClientContext.ts"
 import getBodyType, { ContentErrorBoundary } from "./content"
 import CloseButton from "@/icons/close.svg?react"
 import "./ReplyBody.css"
diff --git a/web/src/ui/timeline/TimelineEvent.tsx b/web/src/ui/timeline/TimelineEvent.tsx
index cd118c4..6d527c8 100644
--- a/web/src/ui/timeline/TimelineEvent.tsx
+++ b/web/src/ui/timeline/TimelineEvent.tsx
@@ -18,7 +18,7 @@ import { getAvatarURL, getMediaURL } from "@/api/media.ts"
 import { useRoomState } from "@/api/statestore"
 import { MemDBEvent, MemberEventContent, UnreadType } from "@/api/types"
 import { isEventID } from "@/util/validation.ts"
-import { ClientContext } from "../ClientContext.ts"
+import ClientContext from "../ClientContext.ts"
 import { LightboxContext } from "../modal/Lightbox.tsx"
 import { useRoomContext } from "../roomcontext.ts"
 import { ReplyIDBody } from "./ReplyBody.tsx"
diff --git a/web/src/ui/timeline/TimelineView.tsx b/web/src/ui/timeline/TimelineView.tsx
index 3a18de0..6c7f307 100644
--- a/web/src/ui/timeline/TimelineView.tsx
+++ b/web/src/ui/timeline/TimelineView.tsx
@@ -17,7 +17,7 @@ import { use, useCallback, useEffect, useLayoutEffect, useRef } from "react"
 import { useRoomTimeline } from "@/api/statestore"
 import { MemDBEvent } from "@/api/types"
 import useFocus from "@/util/focus.ts"
-import { ClientContext } from "../ClientContext.ts"
+import ClientContext from "../ClientContext.ts"
 import { useRoomContext } from "../roomcontext.ts"
 import TimelineEvent from "./TimelineEvent.tsx"
 import "./TimelineView.css"
diff --git a/web/src/ui/timeline/menu/EventExtraMenu.tsx b/web/src/ui/timeline/menu/EventExtraMenu.tsx
index 935a4b6..b742016 100644
--- a/web/src/ui/timeline/menu/EventExtraMenu.tsx
+++ b/web/src/ui/timeline/menu/EventExtraMenu.tsx
@@ -16,7 +16,7 @@
 import { CSSProperties, use, useCallback } from "react"
 import { RoomStateStore, useRoomState } from "@/api/statestore"
 import { MemDBEvent, PowerLevelEventContent } from "@/api/types"
-import { ClientContext } from "../../ClientContext.ts"
+import ClientContext from "../../ClientContext.ts"
 import { ModalCloseContext, ModalContext } from "../../modal/Modal.tsx"
 import { RoomContext, RoomContextData } from "../../roomcontext.ts"
 import ConfirmWithMessageModal from "./ConfirmWithMessageModal.tsx"
diff --git a/web/src/ui/timeline/menu/EventMenu.tsx b/web/src/ui/timeline/menu/EventMenu.tsx
index eac5519..5532534 100644
--- a/web/src/ui/timeline/menu/EventMenu.tsx
+++ b/web/src/ui/timeline/menu/EventMenu.tsx
@@ -17,7 +17,7 @@ import { CSSProperties, use, useCallback, useRef } from "react"
 import { MemDBEvent } from "@/api/types"
 import { emojiToReactionContent } from "@/util/emoji"
 import { useNonNullEventAsState } from "@/util/eventdispatcher.ts"
-import { ClientContext } from "../../ClientContext.ts"
+import ClientContext from "../../ClientContext.ts"
 import EmojiPicker from "../../emojipicker/EmojiPicker.tsx"
 import { ModalContext } from "../../modal/Modal.tsx"
 import { useRoomContext } from "../../roomcontext.ts"