diff --git a/src/app/panels/histogram/module.html b/src/app/panels/histogram/module.html
index 20ca4732d93..f52b408e4cb 100644
--- a/src/app/panels/histogram/module.html
+++ b/src/app/panels/histogram/module.html
@@ -43,11 +43,11 @@
       <!--<a class='small' ng-click='zoom(0.5)'><i class='icon-zoom-in'></i> Zoom In</a>-->
       <a class='small' ng-click='zoom(2)'><i class='icon-zoom-out'></i> Zoom Out</a> |&nbsp
     </span>
-    <span ng-show="panel.legend" ng-repeat='series in data' class="histogram-legend">
-      <i class='icon-circle' ng-style="{color: series.info.color}"></i>
+    <span ng-show="panel.legend" ng-repeat='series in legend' class="histogram-legend">
+      <i class='icon-circle' ng-style="{color: series.color}"></i>
       <span class='small histogram-legend-item'>
-        <span ng-if="panel.show_query">{{series.info.alias || series.info.query}}</span>
-        <span ng-if="!panel.show_query">{{series.info.alias}}</span>
+        <span ng-if="panel.show_query">{{series.alias || series.query}}</span>
+        <span ng-if="!panel.show_query">{{series.alias}}</span>
         <span ng-show="panel.legend_counts"> ({{series.hits}})</span>
       </span>
     </span>
diff --git a/src/app/panels/histogram/module.js b/src/app/panels/histogram/module.js
index 74fa7c906c3..d2a3551d2bd 100644
--- a/src/app/panels/histogram/module.js
+++ b/src/app/panels/histogram/module.js
@@ -380,6 +380,7 @@ function (angular, app, $, _, kbn, moment, timeSeries) {
       return results.then(function(results) {
         $scope.panelMeta.loading = false;
         if(segment === 0) {
+          $scope.legend = [];
           $scope.hits = 0;
           data = [];
           $scope.annotations = [];
@@ -423,6 +424,9 @@ function (angular, app, $, _, kbn, moment, timeSeries) {
               hits += entry.count; // The series level hits counter
               $scope.hits += entry.count; // Entire dataset level hits counter
             });
+
+            $scope.legend[i] = q;
+
             data[i] = {
               info: q,
               time_series: time_series,
@@ -530,7 +534,8 @@ function (angular, app, $, _, kbn, moment, timeSeries) {
         });
 
         // Receive render events
-        scope.$on('render',function(event,data){
+        scope.$on('render',function(event,d){
+          data = d || data;
           render_panel(data);
         });