diff --git a/public/app/plugins/panel/graph/data_processor.ts b/public/app/plugins/panel/graph/data_processor.ts
index 089e4c7dcea..b737c3610be 100644
--- a/public/app/plugins/panel/graph/data_processor.ts
+++ b/public/app/plugins/panel/graph/data_processor.ts
@@ -25,12 +25,20 @@ export class DataProcessor {
 
     switch (this.panel.xaxis.mode) {
       case 'series':
-      case 'histogram':
       case 'time': {
         return options.dataList.map((item, index) => {
           return this.timeSeriesHandler(item, index, options);
         });
       }
+      case 'histogram': {
+        let histogramDataList = [{
+          target: 'count',
+          datapoints: _.concat([], _.flatten(_.map(options.dataList, 'datapoints')))
+        }];
+        return histogramDataList.map((item, index) => {
+          return this.timeSeriesHandler(item, index, options);
+        });
+      }
       case 'field': {
         return this.customHandler(firstItem);
       }
diff --git a/public/app/plugins/panel/graph/graph.ts b/public/app/plugins/panel/graph/graph.ts
index 497ae2f9e08..0556207d08e 100755
--- a/public/app/plugins/panel/graph/graph.ts
+++ b/public/app/plugins/panel/graph/graph.ts
@@ -313,11 +313,7 @@ function graphDirective($rootScope, timeSrv, popoverSrv, contextSrv) {
               let ticks = panel.xaxis.buckets || panelWidth / 50;
               bucketSize = tickStep(histMin, histMax, ticks);
               let histogram = convertValuesToHistogram(values, bucketSize);
-
               data[0].data = histogram;
-              data[0].alias = data[0].label = data[0].id = "count";
-              data = [data[0]];
-
               options.series.bars.barWidth = bucketSize * 0.8;
             } else {
               bucketSize = 0;
diff --git a/public/app/plugins/panel/graph/histogram.ts b/public/app/plugins/panel/graph/histogram.ts
index c60782942f2..8b2be9efcf7 100644
--- a/public/app/plugins/panel/graph/histogram.ts
+++ b/public/app/plugins/panel/graph/histogram.ts
@@ -1,18 +1,21 @@
 import _ from 'lodash';
+import TimeSeries from 'app/core/time_series2';
 
 /**
  * Convert series into array of series values.
  * @param data Array of series
  */
-export function getSeriesValues(data: any): number[] {
+export function getSeriesValues(dataList: TimeSeries[]): number[] {
+  const VALUE_INDEX = 0;
   let values = [];
 
   // Count histogam stats
-  for (let i = 0; i < data.length; i++) {
-    let series = data[i];
-    for (let j = 0; j < series.data.length; j++) {
-      if (series.data[j][1] !== null) {
-        values.push(series.data[j][1]);
+  for (let i = 0; i < dataList.length; i++) {
+    let series = dataList[i];
+    let datapoints = series.datapoints;
+    for (let j = 0; j < datapoints.length; j++) {
+      if (datapoints[j][VALUE_INDEX] !== null) {
+        values.push(datapoints[j][VALUE_INDEX]);
       }
     }
   }
diff --git a/public/app/plugins/panel/graph/specs/histogram.jest.ts b/public/app/plugins/panel/graph/specs/histogram.jest.ts
index 0469b33f259..5b7e34ffa3a 100644
--- a/public/app/plugins/panel/graph/specs/histogram.jest.ts
+++ b/public/app/plugins/panel/graph/specs/histogram.jest.ts
@@ -37,7 +37,9 @@ describe('Graph Histogam Converter', function () {
     beforeEach(() => {
       data = [
         {
-          data: [[0, 1], [0, 2], [0, 10], [0, 11], [0, 17], [0, 20], [0, 29]]
+          datapoints: [
+            [1, 0], [2, 0], [10, 0], [11, 0], [17, 0], [20, 0], [29, 0]
+          ]
         }
       ];
     });
@@ -50,7 +52,7 @@ describe('Graph Histogam Converter', function () {
     });
 
     it('Should skip null values', () => {
-      data[0].data.push([0, null]);
+      data[0].datapoints.push([null, 0]);
 
       let expected = [1, 2, 10, 11, 17, 20, 29];