diff --git a/ui/src/pages/oauth-signin.tsx b/ui/src/pages/oauth-signin.tsx
index e822781..e8d6bbd 100644
--- a/ui/src/pages/oauth-signin.tsx
+++ b/ui/src/pages/oauth-signin.tsx
@@ -1,12 +1,17 @@
 import { useEffect } from "react";
 import { useNavigate } from "react-router-dom";
+import { useSession } from "../contexts/SessionContext";
 
 export const OAuthSigninPage = () => {
   const navigate = useNavigate();
+  const { session } = useSession();
   useEffect(() => {
-    setTimeout(() => {
-      navigate("/");
+    const interval = setInterval(() => {
+      if (session) {
+        navigate("/");
+      }
     }, 100);
-  }, [navigate]);
+    return () => clearInterval(interval);
+  }, [navigate, session]);
   return <></>;
 };