From 5926f4fbe6f119c74f41728358098dcf9bccba81 Mon Sep 17 00:00:00 2001
From: JJ Kasper <jj@jjsweb.site>
Date: Mon, 14 Nov 2022 11:05:52 -0800
Subject: [PATCH] update check

---
 packages/next/shared/lib/router/router.ts | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/packages/next/shared/lib/router/router.ts b/packages/next/shared/lib/router/router.ts
index ac4b12a8874c6..f1d76280c8382 100644
--- a/packages/next/shared/lib/router/router.ts
+++ b/packages/next/shared/lib/router/router.ts
@@ -1218,7 +1218,7 @@ export default class Router implements BaseRouter {
 
     // if a route transition is already in progress before
     // the query updating is triggered ignore query updating
-    if (isQueryUpdating && this.clc) {
+    if (isQueryUpdating && (this.clc || !isSsr)) {
       return false
     }
 
@@ -1424,10 +1424,6 @@ export default class Router implements BaseRouter {
       (!isDynamicRoute(route) ||
         !getRouteMatcher(getRouteRegex(route))(parsedAsPathname))
 
-    if (isMiddlewareRewrite) {
-      isQueryUpdating = false
-    }
-
     // we don't attempt resolve asPath when we need to execute
     // middleware as the resolving will occur server-side
     const isMiddlewareMatch = await matchesMiddleware({
@@ -1577,7 +1573,8 @@ export default class Router implements BaseRouter {
         isPreview: nextState.isPreview,
         hasMiddleware: isMiddlewareMatch,
         unstable_skipClientCache: options.unstable_skipClientCache,
-        isQueryUpdating: isQueryUpdating && !this.isFallback,
+        isQueryUpdating:
+          isQueryUpdating && !this.isFallback && !isMiddlewareRewrite,
       })
 
       if ('route' in routeInfo && isMiddlewareMatch) {