diff --git a/public/app/features/query/state/PanelQueryRunner.ts b/public/app/features/query/state/PanelQueryRunner.ts
index f8be647269d..4db4337a9cd 100644
--- a/public/app/features/query/state/PanelQueryRunner.ts
+++ b/public/app/features/query/state/PanelQueryRunner.ts
@@ -113,6 +113,7 @@ export class PanelQueryRunner {
                 ...processedData,
                 series: lastData.map((frame, frameIndex) => ({
                   ...frame,
+                  length: data.series[frameIndex].length,
                   fields: frame.fields.map((field, fieldIndex) => ({
                     ...field,
                     values: data.series[frameIndex].fields[fieldIndex].values,