try removing the cacheNode.lazyData null logic

packages/next/src/client/components/layout-router.tsx

@@ -419,9 +419,6 @@ function InnerLayoutRouter({
     // When the data has not resolved yet `use` will suspend here.
     const [flightData, overrideCanonicalUrl] = use(lazyData)
 
-    // segmentPath from the server does not match the layout's segmentPath
-    childNode.lazyData = null
-
     // setTimeout is used to start a new transition during render, this is an intentional hack around React.
     setTimeout(() => {
       startTransition(() => {

packages/next/src/shared/lib/router/action-queue.ts

@@ -7,7 +7,6 @@ import {
   ACTION_SERVER_ACTION,
   ACTION_NAVIGATE,
   ACTION_RESTORE,
-  ACTION_SERVER_PATCH,
 } from '../../../client/components/router-reducer/router-reducer-types'
 import type { ReduxDevToolsInstance } from '../../../client/components/use-reducer-with-devtools'
 import { reducer } from '../../../client/components/router-reducer/router-reducer'
@@ -121,10 +120,11 @@ function dispatchAction(
     reject: (reason: any) => void
   } = { resolve: setState, reject: () => {} }
 
-  // most of the action types are async with the exception of restore & server patch
-  // for those cases, because the action is synchronous, we don't need to call setState
-  // to notify React of the pending promise.
-  if (payload.type !== ACTION_RESTORE && payload.type !== ACTION_SERVER_PATCH) {
+  // most of the action types are async with the exception of restore
+  // it's important that restore is handled quickly since it's fired on the popstate event
+  // and we don't want to add any delay on a back/forward nav
+  // this only creates a promise for the async actions
+  if (payload.type !== ACTION_RESTORE) {
     // Create the promise and assign the resolvers to the object.
     const deferredPromise = new Promise<AppRouterState>((resolve, reject) => {
       resolvers = { resolve, reject }