diff --git a/src/app/components/timeSeries.js b/src/app/components/timeSeries.js
index 4422e744d45..6a4e03ae80b 100644
--- a/src/app/components/timeSeries.js
+++ b/src/app/components/timeSeries.js
@@ -70,6 +70,7 @@ function (_, kbn) {
     this.stats.min = Number.MAX_VALUE;
     this.stats.avg = null;
     this.stats.current = null;
+    this.allIsNull = true;
 
     var ignoreNulls = fillStyle === 'connected';
     var nullAsZero = fillStyle === 'null as zero';
@@ -89,6 +90,7 @@ function (_, kbn) {
 
       if (_.isNumber(currentValue)) {
         this.stats.total += currentValue;
+        this.allIsNull = false;
       }
 
       if (currentValue > this.stats.max) {
diff --git a/src/app/panels/graph/axisEditor.html b/src/app/panels/graph/axisEditor.html
index 3aec233f6be..1c25fb26aab 100644
--- a/src/app/panels/graph/axisEditor.html
+++ b/src/app/panels/graph/axisEditor.html
@@ -40,7 +40,7 @@
 <div class="editor-row">
   <div class="section">
     <h5>Legend styles</h5>
-		<editor-opt-bool text="Show legend" model="panel.legend.show" change="render()"></editor-opt-bool>
+		<editor-opt-bool text="Show legend" model="panel.legend.show" change="get_data();"></editor-opt-bool>
 		<editor-opt-bool text="Include values" model="panel.legend.values" change="render()"></editor-opt-bool>
 		<editor-opt-bool text="Align as table" model="panel.legend.alignAsTable" change="render()"></editor-opt-bool>
 		<editor-opt-bool text="Right side" model="panel.legend.rightSide" change="render()"></editor-opt-bool>