diff --git a/web/lib/wrappers/authentication-wrapper.tsx b/web/lib/wrappers/authentication-wrapper.tsx
index 30c85cf8e..8dfd5771a 100644
--- a/web/lib/wrappers/authentication-wrapper.tsx
+++ b/web/lib/wrappers/authentication-wrapper.tsx
@@ -60,7 +60,7 @@ export const AuthenticationWrapper: FC<TAuthenticationWrapper> = observer((props
     return redirectionRoute;
   };
 
-  if (isUserSWRLoading || isUserLoading)
+  if ((isUserSWRLoading || isUserLoading) && !currentUser?.id)
     return (
       <div className="relative flex h-screen w-full items-center justify-center">
         <LogoSpinner />
diff --git a/web/lib/wrappers/instance-wrapper.tsx b/web/lib/wrappers/instance-wrapper.tsx
index c0343a9e1..892838b7e 100644
--- a/web/lib/wrappers/instance-wrapper.tsx
+++ b/web/lib/wrappers/instance-wrapper.tsx
@@ -16,12 +16,12 @@ export const InstanceWrapper: FC<TInstanceWrapper> = observer((props) => {
   // store
   const { isLoading, instance, error, fetchInstanceInfo } = useInstance();
 
-  useSWR("INSTANCE_INFORMATION", () => fetchInstanceInfo(), {
+  const { isLoading: isInstanceSWRLoading } = useSWR("INSTANCE_INFORMATION", () => fetchInstanceInfo(), {
     revalidateOnFocus: false,
   });
 
   // loading state
-  if (isLoading)
+  if ((isLoading || isInstanceSWRLoading) && !instance)
     return (
       <div className="relative flex h-screen w-full items-center justify-center">
         <LogoSpinner />