diff --git a/packages/nicolium/src/components/ui/toast.tsx b/packages/nicolium/src/components/ui/toast.tsx
index 9efece962..385bb139a 100644
--- a/packages/nicolium/src/components/ui/toast.tsx
+++ b/packages/nicolium/src/components/ui/toast.tsx
@@ -117,7 +117,6 @@ const Toast: React.FC<IToast> = (props) => {
         <div className='⁂-toast__dismiss'>
           <button
             type='button'
-            className=''
             onClick={dismissToast}
             data-testid='toast-dismiss'
             title={intl.formatMessage(messages.close)}
diff --git a/packages/nicolium/src/contexts/current-account-context.tsx b/packages/nicolium/src/contexts/current-account-context.tsx
index 4041ad054..043bfb76c 100644
--- a/packages/nicolium/src/contexts/current-account-context.tsx
+++ b/packages/nicolium/src/contexts/current-account-context.tsx
@@ -1,6 +1,6 @@
 import React, { createContext, useContext, useMemo } from 'react';
 
-import { useAuthStore, useMe, type Me } from '@/stores/auth';
+import { defaultClient, useAuthStore, useMe, type Me } from '@/stores/auth';
 
 import type { PlApiClient } from 'pl-api';
 
@@ -9,7 +9,10 @@ interface CurrentAccountContextValue {
   client: PlApiClient;
 }
 
-const CurrentAccountContext = createContext<CurrentAccountContextValue>(null!);
+const CurrentAccountContext = createContext<CurrentAccountContextValue>({
+  me: null,
+  client: defaultClient,
+});
 
 interface ICurrentAccountProvider {
   children: React.ReactNode;
@@ -28,7 +31,7 @@ const DefaultCurrentAccountProvider: React.FC<ICurrentAccountProvider> = ({ chil
   return <CurrentAccountContext.Provider value={value}>{children}</CurrentAccountContext.Provider>;
 };
 
-const useCurrentAccount = () => useContext(CurrentAccountContext)?.me | null;
+const useCurrentAccount = () => useContext(CurrentAccountContext)?.me || null;
 
 const useCurrentAccountContext = () => useContext(CurrentAccountContext);
 
diff --git a/packages/nicolium/src/init/nicolium.tsx b/packages/nicolium/src/init/nicolium.tsx
index 27887a6ce..a8b31e73b 100644
--- a/packages/nicolium/src/init/nicolium.tsx
+++ b/packages/nicolium/src/init/nicolium.tsx
@@ -16,16 +16,16 @@ preload();
 
 /** The root React node of the application. */
 const Nicolium: React.FC = () => (
-  <QueryClientProvider client={queryClient}>
-    <DefaultCurrentAccountProvider>
+  <DefaultCurrentAccountProvider>
+    <QueryClientProvider client={queryClient}>
       <StatProvider>
         <NicoliumHead />
         <NicoliumLoad>
           <NicoliumMount />
         </NicoliumLoad>
       </StatProvider>
-    </DefaultCurrentAccountProvider>
-  </QueryClientProvider>
+    </QueryClientProvider>
+  </DefaultCurrentAccountProvider>
 );
 
 export { Nicolium as default };
diff --git a/packages/nicolium/src/stores/auth.ts b/packages/nicolium/src/stores/auth.ts
index 8640ad980..1391441c1 100644
--- a/packages/nicolium/src/stores/auth.ts
+++ b/packages/nicolium/src/stores/auth.ts
@@ -874,5 +874,6 @@ export {
   addToken,
   loadMastodonPreload,
   removeAccount,
+  defaultClient,
   type Me,
 };