diff --git a/src/screens/MapView/ProfileHeader/index.tsx b/src/screens/MapView/ProfileHeader/index.tsx
index 432cc09c..6d63b94c 100644
--- a/src/screens/MapView/ProfileHeader/index.tsx
+++ b/src/screens/MapView/ProfileHeader/index.tsx
@@ -66,7 +66,6 @@ const ProfileHeader: React.FC<ProfileHeaderProps> = ({
     setIsModalVisible(!isModalVisible);
     addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.FA_ADDRESS_CARD_DIRECTIONS_CLICKED, {
       attempted_at_address: caseDetails?.addressReferenceId,
-      address_rank: caseDetails?.pinRank,
       caseId,
     });
   };
@@ -133,6 +132,7 @@ const ProfileHeader: React.FC<ProfileHeaderProps> = ({
           longitude={caseDetails?.addressLocation?.longitude}
           addressString={caseDetails?.addressString}
           caseId={caseId}
+          referenceId={caseDetails?.addressReferenceId}
         />
       </Tooltip>
     </View>
diff --git a/src/screens/addresses/common/OpenMapOptionsPopUp.tsx b/src/screens/addresses/common/OpenMapOptionsPopUp.tsx
index 1ee453e6..67e1ac49 100644
--- a/src/screens/addresses/common/OpenMapOptionsPopUp.tsx
+++ b/src/screens/addresses/common/OpenMapOptionsPopUp.tsx
@@ -19,8 +19,8 @@ const OpenMapOptionsPopUp = (props: IOpenMapOptionsPopUpProps) => {
   const handleSearchByGeolocation = () => {
     const mapUrl = getGoogleMapUrl(latitude, longitude);
     addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.FA_LAT_LONG_OPTION_CLICKED, {
-      attempted_at_address: caseDetails?.addressReferenceId,
-      address_rank: caseDetails?.pinRank,
+      attempted_at_address: referenceId,
+      address_rank: rank ? rank: '',
       caseId
     });
     if (!mapUrl) return;
@@ -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: referenceId ? referenceId : caseDetails?.addressReferenceId,
-      address_rank: rank ? rank: caseDetails?.pinRank,
+      attempted_at_address: referenceId,
+      address_rank: rank ? rank: '',
       caseId
     });
     if (!mapUrl) return;
diff --git a/src/screens/caseDetails/AllocatedAddressDetails.tsx b/src/screens/caseDetails/AllocatedAddressDetails.tsx
index 500655a3..985ee5c0 100644
--- a/src/screens/caseDetails/AllocatedAddressDetails.tsx
+++ b/src/screens/caseDetails/AllocatedAddressDetails.tsx
@@ -62,7 +62,6 @@ const AllocatedAddressDetails = (props: IAllocatedAddressDetails) => {
     setIsModalVisible(!isModalVisible);
     addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.FA_ADDRESS_CARD_DIRECTIONS_CLICKED, {
       attempted_at_address: caseDetails?.addressReferenceId,
-      address_rank: caseDetails?.pinRank,
       caseId,
     });
   };
@@ -110,6 +109,7 @@ const AllocatedAddressDetails = (props: IAllocatedAddressDetails) => {
           longitude={addressLocation?.longitude}
           addressString={addressString as string}
           caseId={caseId}
+          referenceId={caseDetails?.addressReferenceId}
         />
       </Tooltip>
     </View>