diff --git a/CHANGELOG.md b/CHANGELOG.md
index 230ff061e8d..a6ccfc84ac2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@
 - [Issue #1345](https://github.com/grafana/grafana/issues/1345). UI: Fixed position of confirm modal when scrolled down
 - [Issue #1372](https://github.com/grafana/grafana/issues/1372). Graphite: Fix for nested complex queries, where a query references a query that references another query (ie the #[A-Z] syntax)
 - [Issue #1363](https://github.com/grafana/grafana/issues/1363). Templating: Fix to allow custom template variables to contain white space, now only splits on ','
+- [Issue #1359](https://github.com/grafana/grafana/issues/1359). Graph: Fix for all series tooltip showing series with all null values when ``Hide Empty`` option is enabled
 
 **Tech**
 - [Issue #1311](https://github.com/grafana/grafana/issues/1311). Tech: Updated Font-Awesome from 3.2 to 4.2
diff --git a/src/app/features/templating/templateValuesSrv.js b/src/app/features/templating/templateValuesSrv.js
index 0add3fc5df9..baff0a840b8 100644
--- a/src/app/features/templating/templateValuesSrv.js
+++ b/src/app/features/templating/templateValuesSrv.js
@@ -82,7 +82,7 @@ function (angular, _, kbn) {
     this._updateNonQueryVariable = function(variable) {
       // extract options in comma seperated string
       variable.options = _.map(variable.query.split(/[,]+/), function(text) {
-        return { text: text, value: text };
+        return { text: text.trim(), value: text.trim() };
       });
 
       if (variable.type === 'interval') {
diff --git a/src/app/panels/graph/graph.tooltip.js b/src/app/panels/graph/graph.tooltip.js
index 67d6c601104..9e0ff0b8c7b 100644
--- a/src/app/panels/graph/graph.tooltip.js
+++ b/src/app/panels/graph/graph.tooltip.js
@@ -71,7 +71,7 @@ function ($) {
       for (i = 0; i < seriesList.length; i++) {
         series = seriesList[i];
 
-        if (!series.data.length) {
+        if (!series.data.length || (scope.panel.legend.hideEmpty && series.allIsNull)) {
           results.push({ hidden: true });
           continue;
         }
diff --git a/src/test/specs/graph-tooltip-specs.js b/src/test/specs/graph-tooltip-specs.js
index b7def74ac89..16b4211921f 100644
--- a/src/test/specs/graph-tooltip-specs.js
+++ b/src/test/specs/graph-tooltip-specs.js
@@ -19,6 +19,8 @@ define([
       tooltip:  {
         shared: true
       },
+      legend: {
+      },
       stack: false
     };