diff --git a/packages/web/src/pages/machinery/new-session.tsx b/packages/web/src/pages/machinery/new-session.tsx
index f0deedf..7fe2a00 100644
--- a/packages/web/src/pages/machinery/new-session.tsx
+++ b/packages/web/src/pages/machinery/new-session.tsx
@@ -7,7 +7,7 @@ import { useSessionContext } from '../../contexts/session/SessionContext';
 import { Title } from '../../utils/metaTitle';
 
 const NewSession = () => {
-  const { setupSession, sessionID } = useSessionContext();
+  const { setupSession, sessionID, isAuthenticated } = useSessionContext();
   const [postauthUrl, setPostauthUrl] = React.useState('/servers');
   const navigate = useNavigate();
   const location = useLocation();
@@ -32,10 +32,10 @@ const NewSession = () => {
       setupSession(sessionToken);
     }
 
-    if (sessionID) {
+    if (sessionID && isAuthenticated) {
       navigate(postauthUrl);
     }
-  }, [sessionID, location, postauthUrl, setupSession, navigate]);
+  }, [sessionID, location, postauthUrl, setupSession, navigate, isAuthenticated]);
 
   return (
     <GenericLoadingTemplate>