diff --git a/app/play/page.tsx b/app/play/page.tsx
index 779c653..12908ac 100644
--- a/app/play/page.tsx
+++ b/app/play/page.tsx
@@ -179,9 +179,9 @@ export default function PlayPage() {
               <GameMap map={map.grid} size={52} />
             </CardContent>
             <CardFooter className="flex justify-around px-3">
-              <Link href={`/play/${map.level}`} passHref>
-                <Button>Play</Button>
-              </Link>
+              <Button asChild>
+                <Link href={`/play/${map.level}`}>Play</Link>
+              </Button>
 
               <Authenticated>
                 <div className="flex flex-col items-center gap-y-2">
diff --git a/app/prompts/[promptId]/page.tsx b/app/prompts/[promptId]/page.tsx
index e0cedf7..af1df90 100644
--- a/app/prompts/[promptId]/page.tsx
+++ b/app/prompts/[promptId]/page.tsx
@@ -61,9 +61,9 @@ export default function EditPromptPage({
           <h1 className="mb-4 font-semibold">Edit your prompt</h1>
           <div className="flex space-x-4">
             <Button variant="default">Save</Button>
-            <Link href="/prompts" passHref>
-              <Button variant="default">Return</Button>
-            </Link>
+            <Button asChild variant="default">
+              <Link href="/prompts">Return</Link>
+            </Button>
           </div>
         </div>
         <div className="flex h-screen min-h-screen flex-col items-start space-y-4">
diff --git a/app/prompts/page.tsx b/app/prompts/page.tsx
index 6f9263f..25b193e 100644
--- a/app/prompts/page.tsx
+++ b/app/prompts/page.tsx
@@ -69,13 +69,14 @@ export default function PromptsPage() {
                   >
                     Activate
                   </Button>
-                  <Link
-                    href={`/prompts/${row._id}`}
-                    className="flex items-center"
-                    passHref
-                  >
-                    <Button variant="secondary">Edit</Button>
-                  </Link>
+                  <Button asChild variant="secondary">
+                    <Link
+                      className="flex items-center"
+                      href={`/prompts/${row._id}`}
+                    >
+                      Edit
+                    </Link>
+                  </Button>
                   <Button
                     variant="destructive"
                     onClick={async () => {