diff --git a/packages/grafana-data/src/dataframe/processDataFrame.test.ts b/packages/grafana-data/src/dataframe/processDataFrame.test.ts
index 70fae9a879b..b44a3bf8c72 100644
--- a/packages/grafana-data/src/dataframe/processDataFrame.test.ts
+++ b/packages/grafana-data/src/dataframe/processDataFrame.test.ts
@@ -124,11 +124,13 @@ describe('SerisData backwards compatibility', () => {
     const table = {
       columns: [],
       rows: [],
+      type: 'table',
     };
 
     const series = toDataFrame(table);
     const roundtrip = toLegacyResponseData(series) as TableData;
     expect(roundtrip.columns.length).toBe(0);
+    expect(roundtrip.type).toBe('table');
   });
 
   it('converts TableData to series and back again', () => {
diff --git a/packages/grafana-data/src/dataframe/processDataFrame.ts b/packages/grafana-data/src/dataframe/processDataFrame.ts
index abb8a67aae2..04e61694d47 100644
--- a/packages/grafana-data/src/dataframe/processDataFrame.ts
+++ b/packages/grafana-data/src/dataframe/processDataFrame.ts
@@ -299,6 +299,7 @@ export const toLegacyResponseData = (frame: DataFrame): TimeSeries | TableData =
       }
       return { text: name };
     }),
+    type: 'table',
     refId: frame.refId,
     meta: frame.meta,
     rows,
diff --git a/packages/grafana-data/src/types/data.ts b/packages/grafana-data/src/types/data.ts
index ab90b1519c7..5e7b6da5c07 100644
--- a/packages/grafana-data/src/types/data.ts
+++ b/packages/grafana-data/src/types/data.ts
@@ -47,6 +47,7 @@ export interface TableData extends QueryResultBase {
   name?: string;
   columns: Column[];
   rows: any[][];
+  type?: string;
 }
 
 export type TimeSeriesValue = number | null;