From e8ec237d99b5eb209479b2512eb979ef7e2fcd48 Mon Sep 17 00:00:00 2001
From: MaheshtheDev <38828053+MaheshtheDev@users.noreply.github.com>
Date: Thu, 7 May 2026 06:44:07 +0000
Subject: [PATCH] fix: onboarding org creation issue on skip (#906)

---
 apps/web/app/(app)/onboarding/page.tsx | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/apps/web/app/(app)/onboarding/page.tsx b/apps/web/app/(app)/onboarding/page.tsx
index 00696dec..ac554055 100644
--- a/apps/web/app/(app)/onboarding/page.tsx
+++ b/apps/web/app/(app)/onboarding/page.tsx
@@ -371,6 +371,7 @@ export default function OnboardingPage() {
 	const inputRef = useRef<HTMLInputElement>(null)
 	const fileRef = useRef<HTMLInputElement>(null)
 	const pollingRef = useRef<ReturnType<typeof setInterval> | null>(null)
+	const skippingRef = useRef(false)
 	const [spotlightCategory, setSpotlightCategory] =
 		useState<SpotlightCategoryId>("productivity")
 	const [pauseSpotlight, setPauseSpotlight] = useState(false)
@@ -461,6 +462,18 @@ export default function OnboardingPage() {
 		await refetchOrganizations()
 	}, [user, organizations, refetchOrganizations, setActiveOrg])
 
+	const handleSkip = useCallback(async () => {
+		if (skippingRef.current) return
+		skippingRef.current = true
+		try {
+			await ensureOrg()
+			router.push("/")
+		} catch (err) {
+			console.error(err)
+			skippingRef.current = false
+		}
+	}, [ensureOrg, router])
+
 	const pollDocument = useCallback((docId: string) => {
 		const maxAttempts = 60
 		let attempt = 0
@@ -620,7 +633,7 @@ export default function OnboardingPage() {
 				<Logo className="h-7" />
 				<button
 					type="button"
-					onClick={() => router.push("/")}
+					onClick={handleSkip}
 					className="text-[#525966] text-sm hover:text-white transition-colors cursor-pointer"
 				>
 					Skip for now →
@@ -1096,7 +1109,7 @@ export default function OnboardingPage() {
 								</button>
 								<button
 									type="button"
-									onClick={() => router.push("/")}
+									onClick={handleSkip}
 									className="rounded-xl px-4 py-2.5 text-sm font-medium text-white cursor-pointer border-[0.5px] border-[#161F2C]"
 									style={{
 										background: