diff --git a/site/src/pages/continue-page.tsx b/site/src/pages/continue-page.tsx
index 1101b9b..e07cae3 100644
--- a/site/src/pages/continue-page.tsx
+++ b/site/src/pages/continue-page.tsx
@@ -9,12 +9,16 @@ export const ContinuePage = () => {
   const params = new URLSearchParams(queryString);
   const redirectUri = params.get("redirect_uri");
 
-  const { isLoggedIn } = useUserContext();
+  const { isLoggedIn, disableContinue } = useUserContext();
 
   if (!isLoggedIn) {
     return <Navigate to="/login" />;
   }
 
+  if (disableContinue && redirectUri !== "null") {
+    window.location.replace(redirectUri!);
+  }
+
   const redirect = () => {
     notifications.show({
       title: "Redirecting",
diff --git a/site/src/pages/login-page.tsx b/site/src/pages/login-page.tsx
index ff8e4f7..a84bdee 100644
--- a/site/src/pages/login-page.tsx
+++ b/site/src/pages/login-page.tsx
@@ -25,7 +25,7 @@ export const LoginPage = () => {
   const params = new URLSearchParams(queryString);
   const redirectUri = params.get("redirect_uri");
 
-  const { isLoggedIn, configuredProviders, disableContinue } = useUserContext();
+  const { isLoggedIn, configuredProviders } = useUserContext();
 
   if (isLoggedIn) {
     return <Navigate to="/logout" />;
@@ -65,10 +65,6 @@ export const LoginPage = () => {
         color: "green",
       });
       setTimeout(() => {
-        if (disableContinue) {
-          window.location.replace(redirectUri!);
-          return;
-        }
         window.location.replace(`/continue?redirect_uri=${redirectUri}`);
       });
     },