diff --git a/packages/web/src/app-router/AppRouter.tsx b/packages/web/src/app-router/AppRouter.tsx
index 95c54dd..1aebefe 100644
--- a/packages/web/src/app-router/AppRouter.tsx
+++ b/packages/web/src/app-router/AppRouter.tsx
@@ -30,7 +30,6 @@ export const AppRouter = () => {
       <RouteWrapper component={ServersPage} path="/servers" />
       <RouteWrapper component={PickerPage} path="/s/:serverID" />
 
-      <RouteWrapper component={MachineryNewSession} path="/machinery/new-session" />
       <RouteWrapper
         component={MachineryNewSession}
         path="/machinery/new-session/:sessionID"
diff --git a/packages/web/src/pages/machinery/new-session.tsx b/packages/web/src/pages/machinery/new-session.tsx
index af950f6..aa80af6 100644
--- a/packages/web/src/pages/machinery/new-session.tsx
+++ b/packages/web/src/pages/machinery/new-session.tsx
@@ -9,24 +9,16 @@ const NewSession = (props: { sessionID: string }) => {
   const [postauthUrl, setPostauthUrl] = React.useState('/servers');
 
   React.useEffect(() => {
-    const url = new URL(window.location.href);
-    const id = props.sessionID || url.searchParams.get('session_id');
-    if (id) {
-      localStorage.setItem('rp_session_key', id);
-
-      const storedPostauthUrl = localStorage.getItem('rp_postauth_redirect');
-      if (storedPostauthUrl) {
-        setPostauthUrl(storedPostauthUrl);
-        localStorage.removeItem('rp_postauth_redirect');
-      }
-    }
-  }, [setPostauthUrl, props.sessionID]);
+    setupSession(props.sessionID);
+  }, [props.sessionID, setupSession]);
 
   React.useEffect(() => {
-    if (props.sessionID) {
-      setupSession(props.sessionID);
+    const storedPostauthUrl = localStorage.getItem('rp_postauth_redirect');
+    if (storedPostauthUrl) {
+      setPostauthUrl(storedPostauthUrl);
+      localStorage.removeItem('rp_postauth_redirect');
     }
-  }, [props.sessionID, setupSession]);
+  }, [setPostauthUrl]);
 
   return (
     <>