diff --git a/packages/next/build/webpack/loaders/next-middleware-ssr-loader/render.ts b/packages/next/build/webpack/loaders/next-middleware-ssr-loader/render.ts
index 7fca871b3af8e..44f08b11c9ea3 100644
--- a/packages/next/build/webpack/loaders/next-middleware-ssr-loader/render.ts
+++ b/packages/next/build/webpack/loaders/next-middleware-ssr-loader/render.ts
@@ -107,10 +107,6 @@ export function getRender({
   const requestHandler = server.getRequestHandler()
 
   return async function render(request: NextRequest) {
-    const { nextUrl: url } = request
-    const { searchParams } = url
-    const query = Object.fromEntries(searchParams)
-
     // Preflight request
     if (request.method === 'HEAD') {
       // Hint the client that the matched route is a SSR page.
diff --git a/packages/next/server/render.tsx b/packages/next/server/render.tsx
index e368e80be62b3..f55aad54a077e 100644
--- a/packages/next/server/render.tsx
+++ b/packages/next/server/render.tsx
@@ -511,6 +511,9 @@ export async function renderToHTML(
       ? JSON.parse(query.__props__ as string)
       : undefined
 
+  delete query.__flight__
+  delete query.__props__
+
   const callMiddleware = async (method: string, args: any[], props = false) => {
     let results: any = props ? {} : []