diff --git a/frontend/src/pages/cert-manager/PkiSubscriberDetailsByIDPage/route.tsx b/frontend/src/pages/cert-manager/PkiSubscriberDetailsByIDPage/route.tsx
index fb980ad5d..65a8fdb54 100644
--- a/frontend/src/pages/cert-manager/PkiSubscriberDetailsByIDPage/route.tsx
+++ b/frontend/src/pages/cert-manager/PkiSubscriberDetailsByIDPage/route.tsx
@@ -1,11 +1,5 @@
 import { createFileRoute } from "@tanstack/react-router";
 
-export const Route = createFileRoute(
-  "/_authenticate/_inject-org-details/_org-layout/cert-manager/$projectId/_cert-manager-layout/subscribers/$subscriberId"
-)({
-  component: RouteComponent
-});
-
 function RouteComponent() {
   return (
     <div>
@@ -14,3 +8,9 @@ function RouteComponent() {
     </div>
   );
 }
+
+export const Route = createFileRoute(
+  "/_authenticate/_inject-org-details/_org-layout/cert-manager/$projectId/_cert-manager-layout/subscribers/$subscriberId"
+)({
+  component: RouteComponent
+});
diff --git a/frontend/src/pages/cert-manager/PkiSubscribersPage/route.tsx b/frontend/src/pages/cert-manager/PkiSubscribersPage/route.tsx
index 3f14ebe1b..4c0928674 100644
--- a/frontend/src/pages/cert-manager/PkiSubscribersPage/route.tsx
+++ b/frontend/src/pages/cert-manager/PkiSubscribersPage/route.tsx
@@ -1,12 +1,12 @@
-import { createFileRoute } from "@tanstack/react-router";
+import { createFileRoute } from '@tanstack/react-router'
 
-import { PkiSubscribersPage } from "./PkiSubscribersPage";
+import { PkiSubscribersPage } from './PkiSubscribersPage'
 
 export const Route = createFileRoute(
-  "/_authenticate/_inject-org-details/_org-layout/cert-manager/$projectId/_cert-manager-layout/subscribers"
+  '/_authenticate/_inject-org-details/_org-layout/cert-manager/$projectId/_cert-manager-layout/subscribers/',
 )({
-  component: PkiSubscribersPage
-});
+  component: PkiSubscribersPage,
+})
 
 function RouteComponent() {
   return (
@@ -14,5 +14,5 @@ function RouteComponent() {
       Hello
       "/_authenticate/_inject-org-details/_org-layout/cert-manager/$projectId/_cert-manager-layout/subscribers"!
     </div>
-  );
+  )
 }
diff --git a/frontend/src/routes.ts b/frontend/src/routes.ts
index b71931af1..7e916b012 100644
--- a/frontend/src/routes.ts
+++ b/frontend/src/routes.ts
@@ -284,8 +284,11 @@ const secretManagerIntegrationsRedirect = route("/integrations", [
 
 const certManagerRoutes = route("/cert-manager/$projectId", [
   layout("cert-manager-layout", "cert-manager/layout.tsx", [
-    route("/subscribers/$subscriberId", "cert-manager/PkiSubscriberDetailsByIDPage/route.tsx"),
-    route("/subscribers", "cert-manager/PkiSubscribersPage/route.tsx"),
+    route("/subscribers", [
+      index("cert-manager/PkiSubscribersPage/route.tsx"),
+      route("/$subscriberId", "cert-manager/PkiSubscriberDetailsByIDPage/route.tsx")
+    ]),
+
     route("/overview", "cert-manager/CertificatesPage/route.tsx"),
     route("/certificate-authorities", "cert-manager/CertificateAuthoritiesPage/route.tsx"),
     route("/alerting", "cert-manager/AlertingPage/route.tsx"),