diff --git a/packages/grafana-ui/src/components/Table/RowsList.tsx b/packages/grafana-ui/src/components/Table/RowsList.tsx
index 5194d9d693d..de0e018bc3c 100644
--- a/packages/grafana-ui/src/components/Table/RowsList.tsx
+++ b/packages/grafana-ui/src/components/Table/RowsList.tsx
@@ -254,7 +254,9 @@ export const RowsList = (props: RowsListProps) => {
             <ExpandedRow
               nestedData={nestedDataField}
               tableStyles={tableStyles}
-              rowIndex={index}
+              // Using `row.index` ensures that we pick the correct row from the original data frame even when rows in
+              // the table are sorted, since `row.index` does not change when sorting.
+              rowIndex={row.index}
               width={width}
               cellHeight={cellHeight}
             />
@@ -298,7 +300,7 @@ export const RowsList = (props: RowsListProps) => {
     const indexForPagination = rowIndexForPagination(index);
     const row = rows[indexForPagination];
     if (tableState.expanded[row.id] && nestedDataField) {
-      return getExpandedRowHeight(nestedDataField, index, tableStyles);
+      return getExpandedRowHeight(nestedDataField, row.index, tableStyles);
     }
 
     return tableStyles.rowHeight;
diff --git a/packages/grafana-ui/src/components/Table/Table.test.tsx b/packages/grafana-ui/src/components/Table/Table.test.tsx
index 3d3fc8f5e16..0910e889cca 100644
--- a/packages/grafana-ui/src/components/Table/Table.test.tsx
+++ b/packages/grafana-ui/src/components/Table/Table.test.tsx
@@ -597,7 +597,7 @@ describe('Table', () => {
 
   describe('when mounted with nested data', () => {
     beforeEach(() => {
-      const nestedFrame = (idx: number) =>
+      const createNestedFrame = (idx: number) =>
         applyOverrides(
           toDataFrame({
             name: `nested_frame${idx}`,
@@ -626,7 +626,10 @@ describe('Table', () => {
             {
               name: 'nested',
               type: FieldType.nestedFrames,
-              values: [[nestedFrame(0), nestedFrame(1)]],
+              values: [
+                [createNestedFrame(0), createNestedFrame(1)],
+                [createNestedFrame(2), createNestedFrame(3)],
+              ],
               config: {},
             },
           ],