diff --git a/examples/auth/app/pages/test.tsx b/examples/auth/app/pages/test.tsx
new file mode 100644
index 0000000000..760638dfc1
--- /dev/null
+++ b/examples/auth/app/pages/test.tsx
@@ -0,0 +1,13 @@
+import {useRouter} from "next/router"
+import React from "react"
+
+export default function Test() {
+  const {replace} = useRouter()
+
+  const handleChange = (event: any) => {
+    // replace({ query }, undefined, { shallow: true })
+    replace(`/test?p=${event.target.value}`)
+  }
+
+  return <input onChange={handleChange} />
+}
diff --git a/packages/core/src/blitz-app-root.tsx b/packages/core/src/blitz-app-root.tsx
index 8b2f942218..2b20035fab 100644
--- a/packages/core/src/blitz-app-root.tsx
+++ b/packages/core/src/blitz-app-root.tsx
@@ -73,6 +73,7 @@ export function withBlitzAppRoot(UserAppRoot: React.ComponentType<any>) {
         }
       }
     }
+    const component = React.useMemo(() => withBlitzInnerWrapper(props.Component), [props.Component])
 
     const noPageFlicker =
       props.Component.suppressFirstRenderFlicker ||
@@ -86,7 +87,7 @@ export function withBlitzAppRoot(UserAppRoot: React.ComponentType<any>) {
     return (
       <>
         {noPageFlicker && <NoPageFlicker />}
-        <UserAppRoot {...props} Component={withBlitzInnerWrapper(props.Component)} />
+        <UserAppRoot {...props} Component={component} />
       </>
     )
   }