diff --git a/packages/pluggableWidgets/maps-web/src/components/GoogleMap.tsx b/packages/pluggableWidgets/maps-web/src/components/GoogleMap.tsx
index f8cee6dd3f..9109cf27b4 100644
--- a/packages/pluggableWidgets/maps-web/src/components/GoogleMap.tsx
+++ b/packages/pluggableWidgets/maps-web/src/components/GoogleMap.tsx
@@ -101,8 +101,11 @@ function GoogleMap(props: GoogleMapsProps): ReactElement {
                         {locations
                             .concat(currentLocation ? [currentLocation] : [])
                             .filter(m => !!m)
-                            .map((marker, index) => (
-                                <GoogleMapsMarker key={`marker_${index}`} {...marker} />
+                            .map(marker => (
+                                <GoogleMapsMarker
+                                    key={`marker_${marker.id ?? marker.latitude + "_" + marker.longitude}`}
+                                    {...marker}
+                                />
                             ))}
                     </GoogleMapComponent>
                 ) : (
diff --git a/packages/pluggableWidgets/maps-web/src/components/LeafletMap.tsx b/packages/pluggableWidgets/maps-web/src/components/LeafletMap.tsx
index c1993f05e2..62549c6e49 100644
--- a/packages/pluggableWidgets/maps-web/src/components/LeafletMap.tsx
+++ b/packages/pluggableWidgets/maps-web/src/components/LeafletMap.tsx
@@ -89,7 +89,7 @@ export function LeafletMap(props: LeafletProps): ReactElement {
                     {locations
                         .concat(currentLocation ? [currentLocation] : [])
                         .filter(m => !!m)
-                        .map((marker, index) => (
+                        .map(marker => (
                             <MarkerComponent
                                 icon={
                                     marker.url
@@ -100,7 +100,7 @@ export function LeafletMap(props: LeafletProps): ReactElement {
                                         : defaultMarkerIcon
                                 }
                                 interactive={!!marker.title || !!marker.onClick}
-                                key={`marker_${index}`}
+                                key={`marker_${marker.id ?? marker.latitude + "_" + marker.longitude}`}
                                 eventHandlers={{
                                     click: marker.title ? undefined : marker.onClick
                                 }}
diff --git a/packages/pluggableWidgets/maps-web/src/components/__tests__/__snapshots__/LeafletMap.spec.ts.snap b/packages/pluggableWidgets/maps-web/src/components/__tests__/__snapshots__/LeafletMap.spec.ts.snap
index f286ffeca3..ebd9fe0909 100644
--- a/packages/pluggableWidgets/maps-web/src/components/__tests__/__snapshots__/LeafletMap.spec.ts.snap
+++ b/packages/pluggableWidgets/maps-web/src/components/__tests__/__snapshots__/LeafletMap.spec.ts.snap
@@ -178,7 +178,7 @@ exports[`Leaflet maps renders a map with current location 1`] = `
           }
         }
         interactive={false}
-        key="marker_0"
+        key="marker_51.906688_4.48837"
         position={
           {
             "lat": 51.906688,
@@ -251,7 +251,7 @@ exports[`Leaflet maps renders a map with markers 1`] = `
           }
         }
         interactive={true}
-        key="marker_0"
+        key="marker_51.906688_4.48837"
         position={
           {
             "lat": 51.906688,
@@ -288,7 +288,7 @@ exports[`Leaflet maps renders a map with markers 1`] = `
           }
         }
         interactive={true}
-        key="marker_1"
+        key="marker_51.922823_4.479632"
         position={
           {
             "lat": 51.922823,
diff --git a/packages/pluggableWidgets/maps-web/src/utils/data.ts b/packages/pluggableWidgets/maps-web/src/utils/data.ts
index e9b4f9902c..0811511c5c 100644
--- a/packages/pluggableWidgets/maps-web/src/utils/data.ts
+++ b/packages/pluggableWidgets/maps-web/src/utils/data.ts
@@ -39,7 +39,8 @@ function fromDatasource(marker: DynamicMarkersType, item: ObjectItem): ModeledMa
         longitude,
         title: title ? title.get(item).value : "",
         action: onClickAttribute ? onClickAttribute.get(item).execute : undefined,
-        customMarker: marker.customMarkerDynamic?.value?.uri
+        customMarker: marker.customMarkerDynamic?.value?.uri,
+        id: item.id
     };
 }
 
diff --git a/packages/pluggableWidgets/maps-web/typings/shared.d.ts b/packages/pluggableWidgets/maps-web/typings/shared.d.ts
index d8cbe85a39..9c0c4eeeb2 100644
--- a/packages/pluggableWidgets/maps-web/typings/shared.d.ts
+++ b/packages/pluggableWidgets/maps-web/typings/shared.d.ts
@@ -7,6 +7,7 @@ export interface ModeledMarker {
     title?: string;
     customMarker?: string;
     action?: () => void;
+    id?: string;
 }
 
 export interface Marker {
@@ -15,6 +16,7 @@ export interface Marker {
     url: string;
     onClick?: () => void;
     title?: string;
+    id?: string;
 }
 
 export interface SharedProps extends Dimensions {