diff --git a/public/app/plugins/panel/table/editor.ts b/public/app/plugins/panel/table/editor.ts
index ce5d0c1c828..9850d60c9ad 100644
--- a/public/app/plugins/panel/table/editor.ts
+++ b/public/app/plugins/panel/table/editor.ts
@@ -53,6 +53,10 @@ export class TablePanelEditorCtrl {
 
   transformChanged() {
     this.panel.columns = [];
+    if (this.panel.transform === 'timeseries_aggregations') {
+      this.panel.columns.push({text: 'Avg', value: 'avg'});
+    }
+
     this.render();
   }
 
diff --git a/public/app/plugins/panel/table/transformers.ts b/public/app/plugins/panel/table/transformers.ts
index c7f957e0156..07d183eafa8 100644
--- a/public/app/plugins/panel/table/transformers.ts
+++ b/public/app/plugins/panel/table/transformers.ts
@@ -89,10 +89,6 @@ transformers['timeseries_aggregations'] = {
     var i, y;
     model.columns.push({text: 'Metric'});
 
-    if (panel.columns.length === 0) {
-      panel.columns.push({text: 'Avg', value: 'avg'});
-    }
-
     for (i = 0; i < panel.columns.length; i++) {
       model.columns.push({text: panel.columns[i].text});
     }