diff --git a/api/queries.ts b/api/queries.ts
index 48d1945a..439f85f9 100644
--- a/api/queries.ts
+++ b/api/queries.ts
@@ -11,5 +11,7 @@ export const usePublicApi = (serverUrl: string) => useQuery({
 
 export const useApi = () => useQuery({
     queryKey: [QueryKeys.Api],
-    queryFn: createApi
+    queryFn: () => {
+        return createApi()
+    }
 })
\ No newline at end of file
diff --git a/components/Login/helpers/server-address.tsx b/components/Login/helpers/server-address.tsx
index 4977e682..39703f52 100644
--- a/components/Login/helpers/server-address.tsx
+++ b/components/Login/helpers/server-address.tsx
@@ -19,7 +19,7 @@ const https = "https://"
 
 export default function ServerAddress(): React.JSX.Element {
 
-    const { setServer } = useApiClientContext();
+    const { setServer, refetchApi } = useApiClientContext();
     const { serverAddress, setServerAddress } = useAuthenticationContext();
 
     const [useHttps, setUseHttps] = useState(true)
@@ -46,6 +46,7 @@ export default function ServerAddress(): React.JSX.Element {
             }
 
             setServer(jellifyServer);
+            refetchApi();
             return await mutateServer(jellifyServer);
         },
         onError: async (error: Error) => {
diff --git a/components/Login/provider.tsx b/components/Login/provider.tsx
index 4eac02ee..252e5b0c 100644
--- a/components/Login/provider.tsx
+++ b/components/Login/provider.tsx
@@ -43,7 +43,7 @@ const JellyfinAuthenticationContextInitializer = () => {
     }, [
         serverPending,
         credentialsPending
-    ])
+    ]);
 
     return {
         username,
diff --git a/components/jellyfin-api-provider.tsx b/components/jellyfin-api-provider.tsx
index 0d741b8d..fd7e9536 100644
--- a/components/jellyfin-api-provider.tsx
+++ b/components/jellyfin-api-provider.tsx
@@ -47,13 +47,6 @@ const JellyfinApiClientContextInitializer = () => {
       serverPending,
     ]);
 
-    useEffect(() => {
-      refetchApi();
-    }, [
-      jellyfinServer,
-      username
-    ]);
-
     return { 
       apiClient,
       setApiClient,