diff --git a/packages/runtime/src/components/shared/Link/index.tsx b/packages/runtime/src/components/shared/Link/index.tsx
index 8dadb951f..64f0c97d7 100644
--- a/packages/runtime/src/components/shared/Link/index.tsx
+++ b/packages/runtime/src/components/shared/Link/index.tsx
@@ -123,10 +123,15 @@ export const Link = forwardRef<HTMLAnchorElement, Props>(function Link(
 
   if (useNextLink && href != null) {
     return (
-      <NextLink href={href}>
-        {/* eslint-disable-next-line */}
-        <a {...restOfProps} ref={ref} target={target} onClick={handleClick} />
-      </NextLink>
+      <NextLink
+        {...restOfProps}
+        ref={ref}
+        target={target}
+        onClick={handleClick}
+        href={href}
+        // Next.js v12 has legacyBehavior set to true by default
+        legacyBehavior={false}
+      />
     )
   }