diff --git a/packages/components/src/popover/index.js b/packages/components/src/popover/index.js
index 1599f10893ec5..27db36b8f0ed4 100644
--- a/packages/components/src/popover/index.js
+++ b/packages/components/src/popover/index.js
@@ -215,7 +215,6 @@ const Popover = (
 
 	const arrowRef = useRef( null );
 
-	const [ referenceElement, setReferenceElement ] = useState();
 	const [ fallbackReferenceElement, setFallbackReferenceElement ] =
 		useState();
 	const [ referenceOwnerDocument, setReferenceOwnerDocument ] = useState();
@@ -378,7 +377,6 @@ const Popover = (
 
 		referenceCallbackRef( resultingReferenceElement );
 
-		setReferenceElement( resultingReferenceElement );
 		setReferenceOwnerDocument( resultingReferenceOwnerDoc );
 	}, [
 		anchor,
@@ -502,7 +500,7 @@ const Popover = (
 		content = <Fill name={ slotName }>{ content }</Fill>;
 	}
 
-	if ( referenceElement && referenceElement !== fallbackReferenceElement ) {
+	if ( anchorRef || anchorRect || anchor ) {
 		return content;
 	}