diff --git a/src/screens/addresses/common/AddressItemHeader.tsx b/src/screens/addresses/common/AddressItemHeader.tsx
index 95cd99f3..c5a72179 100644
--- a/src/screens/addresses/common/AddressItemHeader.tsx
+++ b/src/screens/addresses/common/AddressItemHeader.tsx
@@ -124,6 +124,8 @@ const AddressItemHeader = (props: ITopAddressItemHeader) => {
           addressString={locationDetails?.addressText}
           isGeoCoordinatesReliable={locationDetails?.isGeoCoordinatesReliable}
           caseId={caseId}
+          rank={rank}
+          referenceId={locationDetails?.referenceId}
         />
       </Tooltip>
     </View>
diff --git a/src/screens/addresses/common/OpenMapOptionsPopUp.tsx b/src/screens/addresses/common/OpenMapOptionsPopUp.tsx
index 44e8374b..1ee453e6 100644
--- a/src/screens/addresses/common/OpenMapOptionsPopUp.tsx
+++ b/src/screens/addresses/common/OpenMapOptionsPopUp.tsx
@@ -13,7 +13,7 @@ import Tag, { TagVariant } from '@rn-ui-lib/components/Tag';
 import { useAppSelector } from '@hooks';
 
 const OpenMapOptionsPopUp = (props: IOpenMapOptionsPopUpProps) => {
-  const { latitude, longitude, addressString, isGeoCoordinatesReliable, caseId } = props;
+  const { latitude, longitude, addressString, isGeoCoordinatesReliable, caseId, rank, referenceId } = props;
   const caseDetails = useAppSelector((state) => state?.allCases?.caseDetails?.[caseId]);
   
   const handleSearchByGeolocation = () => {
@@ -30,8 +30,8 @@ const OpenMapOptionsPopUp = (props: IOpenMapOptionsPopUpProps) => {
   const handleSearchByAddressString = () => {
     const mapUrl = getGoogleMapUrlForAddressText(addressString);
     addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.FA_SEARCH_ADDRESS_OPTION_CLICKED, {
-      attempted_at_address: caseDetails?.addressReferenceId,
-      address_rank: caseDetails?.pinRank,
+      attempted_at_address: referenceId ? referenceId : caseDetails?.addressReferenceId,
+      address_rank: rank ? rank: caseDetails?.pinRank,
       caseId
     });
     if (!mapUrl) return;
diff --git a/src/screens/addresses/common/interfaces.ts b/src/screens/addresses/common/interfaces.ts
index d45c42ad..9b70006d 100644
--- a/src/screens/addresses/common/interfaces.ts
+++ b/src/screens/addresses/common/interfaces.ts
@@ -4,4 +4,6 @@ export interface IOpenMapOptionsPopUpProps {
   addressString: string;
   isGeoCoordinatesReliable?: boolean;
   caseId: string;
+  rank?: number;
+  referenceId?: string;
 }