diff --git a/apps/web/app/page.tsx b/apps/web/app/page.tsx
index d6edc122..eafa4dcd 100644
--- a/apps/web/app/page.tsx
+++ b/apps/web/app/page.tsx
@@ -677,7 +677,6 @@ export default function Page() {
 	const {
 		data: waitlistStatus,
 		isLoading: isCheckingWaitlist,
-		error: waitlistError,
 	} = useQuery({
 		queryKey: ["waitlist-status", user?.id],
 		queryFn: async () => {
@@ -695,11 +694,24 @@ export default function Page() {
 		retry: 1, // Only retry once on failure
 	});
 
+	useEffect(() => {
+		// save the token for chrome extension
+		const url = new URL(window.location.href);
+		const rawToken = url.searchParams.get("token");
+
+		if (rawToken) {
+			const encodedToken = encodeURIComponent(rawToken);
+			window.postMessage({ token: encodedToken }, "*");
+			url.searchParams.delete("token");
+			window.history.replaceState({}, "", url.toString());
+		}
+	}, []);
+
 	useEffect(() => {
 		if (waitlistStatus && !waitlistStatus.accessGranted) {
 			router.push("/waitlist");
 		}
-	}, []);
+	}, [waitlistStatus, router]);
 
 	// Show loading state while checking authentication and waitlist status
 	if (!user || isCheckingWaitlist) {