diff --git a/app/lish/[did]/[publication]/[rkey]/BaseTextBlock.tsx b/app/lish/[did]/[publication]/[rkey]/BaseTextBlock.tsx
index d947705d..8b90b8a4 100644
--- a/app/lish/[did]/[publication]/[rkey]/BaseTextBlock.tsx
+++ b/app/lish/[did]/[publication]/[rkey]/BaseTextBlock.tsx
@@ -60,6 +60,7 @@ export function BaseTextBlock(props: {
     } else if (isDidMention) {
       children.push(
         <ProfilePopover
+          key={counter}
           didOrHandle={isDidMention.did}
           trigger={<span className="mention">{renderedText}</span>}
         />,
diff --git a/components/ProfilePopover.tsx b/components/ProfilePopover.tsx
index a3c932fa..00c2d127 100644
--- a/components/ProfilePopover.tsx
+++ b/components/ProfilePopover.tsx
@@ -29,6 +29,7 @@ export const ProfilePopover = (props: {
   return (
     <Tooltip
       className="max-w-sm p-0! text-center"
+      asChild
       trigger={
         <a
           className="no-underline"