diff --git a/public/app/plugins/panel/graph/axes_editor.ts b/public/app/plugins/panel/graph/axes_editor.ts
index 591cfba4f17..502af07ff79 100644
--- a/public/app/plugins/panel/graph/axes_editor.ts
+++ b/public/app/plugins/panel/graph/axes_editor.ts
@@ -30,7 +30,7 @@ export class AxesEditorCtrl {
     this.xAxisModes = {
       'Time': 'time',
       'Series': 'series',
-      'Data field': 'field',
+      // 'Data field': 'field',
     };
 
     this.xAxisStatOptions =  [
diff --git a/public/app/plugins/panel/graph/data_processor.ts b/public/app/plugins/panel/graph/data_processor.ts
index 0b80e543e2a..b22d9f391d0 100644
--- a/public/app/plugins/panel/graph/data_processor.ts
+++ b/public/app/plugins/panel/graph/data_processor.ts
@@ -68,6 +68,7 @@ export class DataProcessor {
         this.panel.stack = false;
         this.panel.legend.show = false;
         this.panel.tooltip.shared = false;
+        this.panel.xaxis.values = ['total'];
         break;
       }
     }
diff --git a/public/app/plugins/panel/graph/graph.ts b/public/app/plugins/panel/graph/graph.ts
index 29da2562bf5..f5f943be715 100755
--- a/public/app/plugins/panel/graph/graph.ts
+++ b/public/app/plugins/panel/graph/graph.ts
@@ -236,24 +236,10 @@ module.directive('grafanaGraph', function($rootScope, timeSrv) {
           }
         };
 
-        for (var i = 0; i < data.length; i++) {
+        for (let i = 0; i < data.length; i++) {
           var series = data[i];
           series.data = series.getFlotPairs(series.nullPointMode || panel.nullPointMode);
 
-          if (panel.xaxis.mode === 'series') {
-            series.data = [[i + 1, series.stats[panel.xaxis.values[0]]]];
-          } else if (panel.xaxis.mode === 'table' || panel.xaxis.mode === 'elastic') {
-            series.data = [];
-            for (var j = 0; j < series.datapoints.length; j++) {
-              var dataIndex = i * series.datapoints.length + j;
-              series.datapoints[j];
-              series.data.push([
-                dataIndex + 1,
-                series.datapoints[j][0]
-              ]);
-            }
-          }
-
           // if hidden remove points and disable stack
           if (ctrl.hiddenSeries[series.alias]) {
             series.data = [];
@@ -265,6 +251,12 @@ module.directive('grafanaGraph', function($rootScope, timeSrv) {
           case 'series': {
             options.series.bars.barWidth = 0.7;
             options.series.bars.align = 'center';
+
+            for (let i = 0; i < data.length; i++) {
+              var series = data[i];
+              series.data = [[i + 1, series.stats[panel.xaxis.values[0]]]];
+            }
+
             addXSeriesAxis(options);
             break;
           }
@@ -483,7 +475,7 @@ module.directive('grafanaGraph', function($rootScope, timeSrv) {
         var defaults = {
           position: 'left',
           show: panel.yaxes[0].show,
-          // min: panel.yaxes[0].min,
+          min: panel.yaxes[0].min,
           index: 1,
           logBase: panel.yaxes[0].logBase || 1,
           max: panel.percentage && panel.stack ? 100 : panel.yaxes[0].max,
@@ -494,11 +486,11 @@ module.directive('grafanaGraph', function($rootScope, timeSrv) {
 
         if (_.find(data, {yaxis: 2})) {
           var secondY = _.clone(defaults);
-          secondY.index = 2,
-            secondY.show = panel.yaxes[1].show;
-          secondY.logBase = panel.yaxes[1].logBase || 1,
-            secondY.position = 'right';
-          // secondY.min = panel.yaxes[1].min;
+          secondY.index = 2;
+          secondY.show = panel.yaxes[1].show;
+          secondY.logBase = panel.yaxes[1].logBase || 1;
+          secondY.position = 'right';
+          secondY.min = panel.yaxes[1].min;
           secondY.max = panel.percentage && panel.stack ? 100 : panel.yaxes[1].max;
           // autoscaleSpanOverride(panel.yaxes[1], data[1], secondY);
           options.yaxes.push(secondY);