diff --git a/src/data-table/index.jsx b/src/data-table/index.jsx
index 053da62..89658e5 100644
--- a/src/data-table/index.jsx
+++ b/src/data-table/index.jsx
@@ -73,7 +73,7 @@ const DataTable = ({ data, general, qlik, renderData, styling }) => {
                   }
 
                   const { dimension1: dimension1Info, dimension2, measurement } = measurementData.parents;
-                  const id = `${dimension1Info.elementNumber}-${dimension2 && dimension2.elementNumber}-${measurement.header}`;
+                  const id = `${dimension1Info.elementNumber}-${dimension2 && dimension2.elementNumber}-${measurement.header}-${measurement.index}`;
                   return (
                     <DataCell
                       data={data}
diff --git a/src/headers-table/index.jsx b/src/headers-table/index.jsx
index 31fb82c..51e6017 100644
--- a/src/headers-table/index.jsx
+++ b/src/headers-table/index.jsx
@@ -42,7 +42,7 @@ const HeadersTable = ({ data, general, qlik, styling, isKpi }) => {
                 baseCSS={baseCSS}
                 general={general}
                 hasSecondDimension={hasSecondDimension}
-                key={`${measurementEntry.displayValue}-${measurementEntry.name}`}
+                key={`${measurementEntry.displayValue}-${measurementEntry.name}-${measurementEntry.index}`}
                 measurement={measurementEntry}
                 styling={styling}
               />
@@ -104,7 +104,7 @@ const HeadersTable = ({ data, general, qlik, styling, isKpi }) => {
                     dimensionEntry={dimensionEntry}
                     general={general}
                     hasSecondDimension={hasSecondDimension}
-                    key={`${measurementEntry.displayValue}-${measurementEntry.name}-${dimensionEntry.name}`}
+                    key={`${measurementEntry.displayValue}-${measurementEntry.name}-${measurementEntry.index}-${dimensionEntry.name}`}
                     measurement={measurementEntry}
                     styling={styling}
                   />