diff --git a/packages/grafana-data/src/dataframe/ArrowDataFrame.ts b/packages/grafana-data/src/dataframe/ArrowDataFrame.ts
index aa78b1f20a4..891051214bd 100644
--- a/packages/grafana-data/src/dataframe/ArrowDataFrame.ts
+++ b/packages/grafana-data/src/dataframe/ArrowDataFrame.ts
@@ -112,7 +112,13 @@ function toArrowVector(field: Field): ArrowVector {
 }
 
 export function grafanaDataFrameToArrowTable(data: DataFrame): Table {
-  const table = Table.new(
+  // Return the original table
+  let table = (data as any).table;
+  if (table instanceof Table) {
+    return table as Table;
+  }
+
+  table = Table.new(
     data.fields.map(field => {
       const column = Column.new(field.name, toArrowVector(field));
       if (field.labels) {
diff --git a/packages/grafana-data/src/dataframe/index.ts b/packages/grafana-data/src/dataframe/index.ts
index 26ca17d4bcf..1626c3294fd 100644
--- a/packages/grafana-data/src/dataframe/index.ts
+++ b/packages/grafana-data/src/dataframe/index.ts
@@ -4,6 +4,4 @@ export * from './CircularDataFrame';
 export * from './MutableDataFrame';
 export * from './processDataFrame';
 export * from './dimensions';
-
-// Phantom JS :(
-//export * from './ArrowDataFrame';
+export * from './ArrowDataFrame';