diff --git a/public/app/plugins/datasource/prometheus/result_transformer.test.ts b/public/app/plugins/datasource/prometheus/result_transformer.test.ts
index 640a2008fad..655efc7589a 100644
--- a/public/app/plugins/datasource/prometheus/result_transformer.test.ts
+++ b/public/app/plugins/datasource/prometheus/result_transformer.test.ts
@@ -141,7 +141,7 @@ describe('Prometheus Result Transformer', () => {
       expect(series.data[0].fields[2].name).toEqual('label2');
       expect(series.data[0].fields[3].name).toEqual('label3');
       expect(series.data[0].fields[4].name).toEqual('label4');
-      expect(series.data[0].fields[5].name).toEqual('Value #A');
+      expect(series.data[0].fields[5].name).toEqual('Value');
       expect(series.data[0].meta?.preferredVisualisationType).toEqual('table');
     });
 
diff --git a/public/app/plugins/datasource/prometheus/result_transformer.ts b/public/app/plugins/datasource/prometheus/result_transformer.ts
index d6244c959b7..8042789dce3 100644
--- a/public/app/plugins/datasource/prometheus/result_transformer.ts
+++ b/public/app/plugins/datasource/prometheus/result_transformer.ts
@@ -122,10 +122,11 @@ export function transformDFToTable(dfs: DataFrame[]): DataFrame[] {
 
   // Group results by refId and process dataFrames with the same refId as 1 dataFrame
   const dataFramesByRefId = groupBy(dfs, 'refId');
+  const refIds = Object.keys(dataFramesByRefId);
 
-  const frames = Object.keys(dataFramesByRefId).map((refId) => {
+  const frames = refIds.map((refId) => {
     // Create timeField, valueField and labelFields
-    const valueText = getValueText(dfs.length, refId);
+    const valueText = getValueText(refIds.length, refId);
     const valueField = getValueField({ data: [], valueName: valueText });
     const timeField = getTimeField([]);
     const labelFields: MutableField[] = [];