diff --git a/src/hooks/useApi.ts b/src/hooks/useApi.ts index 23fd16875..14385b57a 100644 --- a/src/hooks/useApi.ts +++ b/src/hooks/useApi.ts @@ -7,8 +7,9 @@ import { useOwnAccount } from './useOwnAccount'; export function useApi(): MastodonClient { const { account } = useOwnAccount(); + const authUserUrl = useAppSelector((state) => state.auth.me); const accessToken = useAppSelector((state) => account ? state.auth.users.get(account.url)?.access_token : undefined); - const baseUrl = account ? new URL(account.url).origin : location.origin; + const baseUrl = new URL(account?.url || authUserUrl || location.origin).origin; return useMemo(() => { return new MastodonClient(baseUrl, accessToken);