MapsPeople · matbmapspeople · Mar 25, 2026 · Mar 24, 2026 · Mar 24, 2026 · Mar 24, 2026
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/map-template/CHANGELOG.md b/packages/map-template/CHANGELOG.md
@@ -5,7 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [1.97.0] - 2026-03-23
+## [1.96.15] - 2026-03-24
+
+### Fixed
+
+- States when location is both highlighted and selected.
+
+## [1.96.14] - 2026-03-23
 
 ### Added
 

diff --git a/packages/map-template/src/components/MapTemplate/MapTemplate.jsx b/packages/map-template/src/components/MapTemplate/MapTemplate.jsx
@@ -587,7 +587,19 @@ function MapTemplate({ apiKey, gmApiKey, mapboxAccessToken, venue, locationId, p
 
         if (currentLocation && currentLocation.id !== kioskOriginLocationId) {
             if (mapsIndoorsInstance?.selectLocation) {
-                mapsIndoorsInstance.selectLocation(currentLocation);
+
+                // On selection, unhighlight current locations if it is highlighted.
+                if (mapsIndoorsInstance?.getHighlight?.()?.length > 0) {
+                    mapsIndoorsInstance.highlight([]);
+                }
+
+                // When Location is selected from a List, wait until the highlight is cleared before selecting the location.
+                // TODO: This is a workaround to ensure the highlight is cleared before selecting the location.
+                setTimeout(() => {
+                    if (mapsIndoorsInstance?.getHighlight?.()?.length === 0) {
+                        mapsIndoorsInstance.selectLocation(currentLocation);
+                    }
+                }, 500);
             }
         } else {
             if (mapsIndoorsInstance?.deselectLocation) {