diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Miscellaneous/ListStoreLocator.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Miscellaneous/ListStoreLocator.swift
index 6c1e65e5..177f4b1a 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Miscellaneous/ListStoreLocator.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Miscellaneous/ListStoreLocator.swift
@@ -124,10 +124,6 @@ import Foundation
             message += leftSubBodyText + ", "
         }
         
-        if let heartLabel = heart.accessibilityLabel {
-            message += heartLabel + ", "
-        }
-        
         if let rightLabelText = rightLabel.text, !rightLabelText.isEmpty {
             message += rightLabelText
         }
@@ -143,7 +139,12 @@ import Foundation
         } else {
             // Make whole cell focusable if no action.
             isAccessibilityElement = true
-            accessibilityLabel = getAccessibilityMessage()
+            if let message = getAccessibilityMessage(),
+                let heartLabel = heart.accessibilityLabel {
+                accessibilityLabel = message + ", " + heartLabel
+            } else {
+                accessibilityLabel = getAccessibilityMessage()
+            }
         }
     }
 }