diff --git a/apps/fo/middleware.ts b/apps/fo/middleware.ts
index cca7ecd22..870997941 100644
--- a/apps/fo/middleware.ts
+++ b/apps/fo/middleware.ts
@@ -91,7 +91,8 @@ export function middleware(req: NextRequest) {
     }
 
     console.log(`[Middleware] Rewriting from '/geoserver' path to: ${newUrl}`);
-    return NextResponse.rewrite(new URL(newUrl));
+    const rewriteRequest = rewriteWith(newUrl, req, true);
+    return rewriteRequest;
   }
 
   if (pathname.startsWith("/sewerage-service")) {
diff --git a/apps/sn/middleware.ts b/apps/sn/middleware.ts
index 13b94a86e..97f4fcce7 100644
--- a/apps/sn/middleware.ts
+++ b/apps/sn/middleware.ts
@@ -99,7 +99,8 @@ export function middleware(req: NextRequest) {
     }
 
     console.log(`[Middleware] Rewriting from '/geoserver' path to: ${newUrl}`);
-    return NextResponse.rewrite(new URL(newUrl));
+    const rewriteRequest = rewriteWith(newUrl, req, true);
+    return rewriteRequest;
   }
 
   if (pathname.startsWith("/attach-service")
diff --git a/apps/wr/middleware.ts b/apps/wr/middleware.ts
index 40bdd0f20..a5956ee0b 100644
--- a/apps/wr/middleware.ts
+++ b/apps/wr/middleware.ts
@@ -122,7 +122,8 @@ export function middleware(req: NextRequest) {
     }
 
     //console.log(`[Middleware] Rewriting from '/geoserver' path to: ${newUrl}`);
-    return NextResponse.rewrite(new URL(newUrl));
+    const rewriteRequest = rewriteWith(newUrl, req, true);
+    return rewriteRequest;
   }
 
   if (pathname.startsWith("/sewerage-service")) {