diff --git a/apps/web/components/ensure-workspace.tsx b/apps/web/components/ensure-workspace.tsx
index 73218af2..0d4a69bb 100644
--- a/apps/web/components/ensure-workspace.tsx
+++ b/apps/web/components/ensure-workspace.tsx
@@ -20,12 +20,12 @@ export function EnsureWorkspace({ children }: { children: React.ReactNode }) {
 	const pathname = usePathname()
 	const router = useRouter()
 	const searchParams = useSearchParams()
-	const { session, organizations, isRestoring } = useAuth()
+	const { session, organizations, isRestoring, isSessionPending } = useAuth()
 
 	const isPublicAppPage =
 		pathname === "/" &&
 		["integrations", "mcp"].includes(searchParams.get("view") ?? "")
-	const isGuestPublicAppPage = isPublicAppPage && !session
+	const isGuestPublicAppPage = isPublicAppPage && !session && !isSessionPending
 	const isOnboarding = pathname.startsWith("/onboarding")
 
 	useEffect(() => {