diff --git a/src/data-table/index.jsx b/src/data-table/index.jsx
index 0e350b9..99d2d01 100644
--- a/src/data-table/index.jsx
+++ b/src/data-table/index.jsx
@@ -121,7 +121,7 @@ class DataTable extends React.PureComponent {
               };
 
               return (
-                <tr key={dimensionEntry.displayValue}>
+                <tr key={`${dimensionEntry.displayValue}-${dimensionIndex}-separator`}>
                   {!renderData ?
                     <RowHeader
                       component={component}
diff --git a/src/headers-table/index.jsx b/src/headers-table/index.jsx
index 1e9fe26..1151830 100644
--- a/src/headers-table/index.jsx
+++ b/src/headers-table/index.jsx
@@ -77,7 +77,7 @@ class HeadersTable extends React.PureComponent {
                     colSpan={measurements.length}
                     component={component}
                     entry={entry}
-                    key={entry.displayValue}
+                    key={`${entry.displayValue}-${index}-separator`}
                     styling={styling}
                   />
                 );