gisttor
diff --git a/‎packages/next/shared/lib/router/router.ts
Lines changed: 3 additions & 1 deletion b/‎packages/next/shared/lib/router/router.ts
Lines changed: 3 additions & 1 deletion
diff --git a/‎test/integration/dynamic-routing/pages/index.js
Lines changed: 4 additions & 0 deletions b/‎test/integration/dynamic-routing/pages/index.js
Lines changed: 4 additions & 0 deletions
diff --git a/‎test/integration/dynamic-routing/test/index.test.js
Lines changed: 17 additions & 0 deletions b/‎test/integration/dynamic-routing/test/index.test.js
Lines changed: 17 additions & 0 deletions
@@ -833,7 +833,9 @@ export default class Router implements BaseRouter {
       return false
     }
     const shouldResolveHref =
-      url === as || (options as any)._h || (options as any)._shouldResolveHref
+      (options as any)._h ||
+      (options as any)._shouldResolveHref ||
+      pathNoQueryHash(url) === pathNoQueryHash(as)
 
     // for static pages with query params in the URL we delay
     // marking the router ready until after the query is updated
 
@@ -26,6 +26,10 @@ const Page = () => {
         <a id="view-post-1-hash-1-href-only">View post 1 (hash only href)</a>
       </Link>
       <br />
+      <Link href="/post-1?hidden=value" as="/post-1">
+        <a id="view-post-1-hidden-query">View post 1 (href query)</a>
+      </Link>
+      <br />
       <Link
         href={{
           hash: 'my-hash',
 
@@ -368,6 +368,23 @@ function runTests(dev) {
     }
   })
 
+  it('should navigate to a dynamic page with href with differing query and as correctly', async () => {
+    let browser
+    try {
+      browser = await webdriver(appPort, '/')
+      await browser.eval('window.beforeNav = 1')
+      await browser.elementByCss('#view-post-1-hidden-query').click()
+      await browser.waitForElementByCss('#asdf')
+
+      expect(await browser.eval('window.beforeNav')).toBe(1)
+
+      const text = await browser.elementByCss('#asdf').text()
+      expect(text).toMatch(/this is.*?post-1/i)
+    } finally {
+      if (browser) await browser.close()
+    }
+  })
+
   it('should navigate to a dynamic page successfully no as', async () => {
     let browser
     try {