diff --git a/apps/web/middleware.ts b/apps/web/middleware.ts
index 0b17f5ff61..8156b41c39 100644
--- a/apps/web/middleware.ts
+++ b/apps/web/middleware.ts
@@ -54,13 +54,6 @@ const middleware: NextMiddleware = async (req) => {
 
 const routingForms = {
   handle: (url: URL) => {
-    // Next.config.js Redirects don't handle Client Side navigations and we need that.
-    // So, we add the rewrite here instead.
-    if (url.pathname.startsWith("/routing-forms")) {
-      url.pathname = url.pathname.replace(/^\/routing-forms($|\/)/, "/apps/routing-forms/");
-      return NextResponse.rewrite(url);
-    }
-
     // Don't 404 old routing_forms links
     if (url.pathname.startsWith("/apps/routing_forms")) {
       url.pathname = url.pathname.replace(/^\/apps\/routing_forms($|\/)/, "/apps/routing-forms/");
@@ -80,7 +73,6 @@ export const config = {
      * Paths required by routingForms.handle
      */
     "/apps/routing_forms/:path*",
-    "/routing-forms/:path*",
   ],
 };
 
diff --git a/apps/web/pages/routing-forms/[...pages].tsx b/apps/web/pages/routing-forms/[...pages].tsx
new file mode 100644
index 0000000000..13576b185a
--- /dev/null
+++ b/apps/web/pages/routing-forms/[...pages].tsx
@@ -0,0 +1,25 @@
+import type { GetServerSidePropsContext } from "next";
+import z from "zod";
+
+const paramsSchema = z
+  .object({
+    pages: z.array(z.string()),
+  })
+  .catch({
+    pages: [],
+  });
+
+export default function RoutingForms() {
+  return null;
+}
+
+export const getServerSideProps = (context: GetServerSidePropsContext) => {
+  const { pages } = paramsSchema.parse(context.params);
+
+  return {
+    redirect: {
+      destination: `/apps/routing-forms/${pages.length ? pages.join("/") : ""}`,
+      permanent: false,
+    },
+  };
+};
diff --git a/apps/web/pages/routing-forms/index.tsx b/apps/web/pages/routing-forms/index.tsx
new file mode 100644
index 0000000000..c2032de1dd
--- /dev/null
+++ b/apps/web/pages/routing-forms/index.tsx
@@ -0,0 +1,12 @@
+export default function RoutingFormsIndex() {
+  return null;
+}
+
+export const getServerSideProps = () => {
+  return {
+    redirect: {
+      destination: `/apps/routing-forms/forms`,
+      permanent: false,
+    },
+  };
+};
diff --git a/packages/app-store/routing-forms/config.json b/packages/app-store/routing-forms/config.json
index 914b394a14..55ad690527 100644
--- a/packages/app-store/routing-forms/config.json
+++ b/packages/app-store/routing-forms/config.json
@@ -10,7 +10,7 @@
   "variant": "other",
   "categories": ["automation"],
   "publisher": "Cal.com, Inc.",
-  "simplePath": "/routing-forms",
+  "simplePath": "/apps/routing-forms",
   "email": "help@cal.com",
   "licenseRequired": true,
   "teamsPlanRequired": {
diff --git a/packages/app-store/routing-forms/pages/form-edit/[...appPages].tsx b/packages/app-store/routing-forms/pages/form-edit/[...appPages].tsx
index 802758f56c..fdfb51dc71 100644
--- a/packages/app-store/routing-forms/pages/form-edit/[...appPages].tsx
+++ b/packages/app-store/routing-forms/pages/form-edit/[...appPages].tsx
@@ -425,7 +425,7 @@ export default function FormEditPage({
 
 FormEditPage.getLayout = (page: React.ReactElement) => {
   return (
-    <Shell backPath="/routing-forms/forms" withoutMain={true}>
+    <Shell backPath="/apps/routing-forms/forms" withoutMain={true}>
       {page}
     </Shell>
   );
diff --git a/packages/app-store/routing-forms/pages/reporting/[...appPages].tsx b/packages/app-store/routing-forms/pages/reporting/[...appPages].tsx
index 9d8522697e..b92ab481d6 100644
--- a/packages/app-store/routing-forms/pages/reporting/[...appPages].tsx
+++ b/packages/app-store/routing-forms/pages/reporting/[...appPages].tsx
@@ -199,7 +199,7 @@ export default function ReporterWrapper({
 
 ReporterWrapper.getLayout = (page: React.ReactElement) => {
   return (
-    <Shell backPath="/routing-forms/forms" withoutMain={true}>
+    <Shell backPath="/apps/routing-forms/forms" withoutMain={true}>
       {page}
     </Shell>
   );
diff --git a/packages/app-store/routing-forms/pages/route-builder/[...appPages].tsx b/packages/app-store/routing-forms/pages/route-builder/[...appPages].tsx
index efb0431557..07b43aa06d 100644
--- a/packages/app-store/routing-forms/pages/route-builder/[...appPages].tsx
+++ b/packages/app-store/routing-forms/pages/route-builder/[...appPages].tsx
@@ -562,7 +562,7 @@ export default function RouteBuilder({
 
 RouteBuilder.getLayout = (page: React.ReactElement) => {
   return (
-    <Shell backPath="/routing-forms/forms" withoutMain={true}>
+    <Shell backPath="/apps/routing-forms/forms" withoutMain={true}>
       {page}
     </Shell>
   );
diff --git a/packages/features/shell/Shell.tsx b/packages/features/shell/Shell.tsx
index 437f660be2..9d007d2489 100644
--- a/packages/features/shell/Shell.tsx
+++ b/packages/features/shell/Shell.tsx
@@ -547,7 +547,7 @@ const navigation: NavigationItemType[] = [
     icon: Grid,
     isCurrent: ({ pathname: path, item }) => {
       // During Server rendering path is /v2/apps but on client it becomes /apps(weird..)
-      return path?.startsWith(item.href) || path?.startsWith("/v2" + item.href);
+      return path?.startsWith(item.href) && !path?.includes("routing-forms/");
     },
     child: [
       {
@@ -556,8 +556,7 @@ const navigation: NavigationItemType[] = [
         isCurrent: ({ pathname: path, item }) => {
           // During Server rendering path is /v2/apps but on client it becomes /apps(weird..)
           return (
-            (path?.startsWith(item.href) || path?.startsWith("/v2" + item.href)) &&
-            !path.includes("/installed")
+            path?.startsWith(item.href) && !path?.includes("routing-forms/") && !path?.includes("/installed")
           );
         },
       },
@@ -576,9 +575,9 @@ const navigation: NavigationItemType[] = [
   },
   {
     name: "Routing Forms",
-    href: "/routing-forms/forms",
+    href: "/apps/routing-forms/forms",
     icon: FileText,
-    isCurrent: ({ pathname }) => pathname?.startsWith("/routing-forms/"),
+    isCurrent: ({ pathname }) => pathname?.startsWith("/apps/routing-forms/"),
   },
   {
     name: "workflows",