diff --git a/src/components/Tooltip/index.tsx b/src/components/Tooltip/index.tsx
index 6d054d0faa..0d0c81a830 100644
--- a/src/components/Tooltip/index.tsx
+++ b/src/components/Tooltip/index.tsx
@@ -95,8 +95,10 @@ export function Outer({
        * Once opened, measure the dimensions and position of the target
        */
       targetRef.current.measure((_x, _y, width, height, pageX, pageY) => {
-        setTargetMeasurements({x: pageX, y: pageY, width, height})
-        setReady(true)
+        if (pageX !== undefined && pageY !== undefined && width && height) {
+          setTargetMeasurements({x: pageX, y: pageY, width, height})
+          setReady(true)
+        }
       })
     }
   } else if (!requestVisible && prevRequestVisible) {
@@ -123,16 +125,14 @@ export function Outer({
   )
 }
 
-export function Target({
-  children,
-}: {
-  children: (props: {ref: TargetContextType['targetRef']}) => React.ReactNode
-}) {
+export function Target({children}: {children: React.ReactNode}) {
   const {targetRef} = useContext(TargetContext)
 
-  return children({
-    ref: targetRef,
-  })
+  return (
+    <View collapsable={false} ref={targetRef}>
+      {children}
+    </View>
+  )
 }
 
 export function Content({
diff --git a/src/components/Tooltip/index.web.tsx b/src/components/Tooltip/index.web.tsx
index ef52affb97..97330aa485 100644
--- a/src/components/Tooltip/index.web.tsx
+++ b/src/components/Tooltip/index.web.tsx
@@ -38,12 +38,12 @@ export function Outer({
   )
 }
 
-export function Target({
-  children,
-}: {
-  children: (props: {ref: undefined}) => React.ReactNode
-}) {
-  return <Popover.Trigger asChild>{children({ref: undefined})}</Popover.Trigger>
+export function Target({children}: {children: React.ReactNode}) {
+  return (
+    <Popover.Trigger asChild>
+      <View collapsable={false}>{children}</View>
+    </Popover.Trigger>
+  )
 }
 
 export function Content({
diff --git a/src/screens/Profile/Header/ProfileHeaderStandard.tsx b/src/screens/Profile/Header/ProfileHeaderStandard.tsx
index 2e62520ca7..734a7365e7 100644
--- a/src/screens/Profile/Header/ProfileHeaderStandard.tsx
+++ b/src/screens/Profile/Header/ProfileHeaderStandard.tsx
@@ -218,11 +218,7 @@ let ProfileHeaderStandard = ({
                     visible={visible}
                     onVisibleChange={setVisible}>
                     <Tooltip.Target>
-                      {({ref}) => (
-                        <View ref={ref}>
-                          <MessageProfileButton profile={profile} />
-                        </View>
-                      )}
+                      <MessageProfileButton profile={profile} />
                     </Tooltip.Target>
                     <Tooltip.TextBubble>
                       <Text>