diff --git a/client/src/features/session/components/ProjectSessionsRouter.tsx b/client/src/features/session/components/ProjectSessionsRouter.tsx
index 8d7f0342a..077a780fa 100644
--- a/client/src/features/session/components/ProjectSessionsRouter.tsx
+++ b/client/src/features/session/components/ProjectSessionsRouter.tsx
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import { Route, Switch } from "react-router";
+import { Route, Routes } from "react-router-dom-v5-compat";
 import { Col } from "reactstrap";
 
 import useLegacySelector from "../../../utils/customHooks/useLegacySelector.hook";
@@ -44,26 +44,25 @@ export default function ProjectSessionsRouter() {
   const startSessionUrl = Url.get(
     Url.pages.project.session.new,
     projectUrlData
-  );
+  ).slice(sessionsListUrl.length);
   const sessionShowUrl = Url.get(Url.pages.project.session.show, {
     namespace,
     path,
     server: ":server",
-  });
+  }).slice(sessionsListUrl.length);
 
   return (
     <Col key="content" xs={12}>
-      <Switch>
-        <Route exact path={sessionsListUrl}>
-          <ProjectSessionsList projectPathWithNamespace={pathWithNamespace} />
-        </Route>
-        <Route path={startSessionUrl}>
-          <StartNewSession />
-        </Route>
-        <Route path={sessionShowUrl}>
-          <ShowSession />
-        </Route>
-      </Switch>
+      <Routes>
+        <Route
+          index
+          element={
+            <ProjectSessionsList projectPathWithNamespace={pathWithNamespace} />
+          }
+        />
+        <Route path={startSessionUrl} element={<StartNewSession />} />
+        <Route path={sessionShowUrl} element={<ShowSession />} />
+      </Routes>
     </Col>
   );
 }
diff --git a/client/src/features/sessionsV2/SessionShowPage/ShowSessionPage.tsx b/client/src/features/sessionsV2/SessionShowPage/ShowSessionPage.tsx
index 4d267c7ad..c48419d6b 100644
--- a/client/src/features/sessionsV2/SessionShowPage/ShowSessionPage.tsx
+++ b/client/src/features/sessionsV2/SessionShowPage/ShowSessionPage.tsx
@@ -43,6 +43,7 @@ import {
   ModalHeader,
   UncontrolledTooltip,
 } from "reactstrap";
+
 import { Loader } from "../../../components/Loader";
 import EnvironmentLogsV2 from "../../../components/LogsV2";
 import { TimeCaption } from "../../../components/TimeCaption";
diff --git a/client/src/project/Project.present.jsx b/client/src/project/Project.present.jsx
index 17319f4f8..fd09e6696 100644
--- a/client/src/project/Project.present.jsx
+++ b/client/src/project/Project.present.jsx
@@ -977,9 +977,9 @@ function ProjectView(props) {
               metadataVersion={metadataVersion}
             />
           </CompatRoute>
-          <Route path={props.notebookServersUrl}>
+          <CompatRoute path={props.notebookServersUrl}>
             <ProjectSessionsRouter key="sessions" />
-          </Route>
+          </CompatRoute>
           <Route component={NotFoundInsideProject} />
         </Switch>
       </Row>