diff --git a/src/app/panels/graphite/module.js b/src/app/panels/graphite/module.js
index 22b5bfe388b..108958058c6 100644
--- a/src/app/panels/graphite/module.js
+++ b/src/app/panels/graphite/module.js
@@ -338,7 +338,7 @@ function (angular, app, $, _, kbn, moment, timeSeries) {
         var time_series = new timeSeries.ZeroFilled(tsOpts);
 
         _.each(targetData.datapoints, function(valueArray) {
-          if (valueArray[0]) {
+          if (valueArray[0] !== null) {
             time_series.addValue(valueArray[1] * 1000, valueArray[0]);
           }
         });
diff --git a/src/app/panels/graphite/timeSeries.js b/src/app/panels/graphite/timeSeries.js
index ff8f04406a2..0b325c5f13c 100644
--- a/src/app/panels/graphite/timeSeries.js
+++ b/src/app/panels/graphite/timeSeries.js
@@ -218,7 +218,7 @@ function (_, Interval) {
   ts.ZeroFilled.prototype._getNoZeroFlotPairs = function (result, time) {
 
     // add the current time
-    if(this._data[time]){
+    if(this._data[time] !== null){
       result.push([ time, this._data[time]]);
     }
 
diff --git a/src/config.js b/src/config.js
index 84a66634464..d26bee82c69 100644
--- a/src/config.js
+++ b/src/config.js
@@ -15,11 +15,6 @@ function (Settings) {
      */
     elasticsearch: "http://"+window.location.hostname+":9200",
 
-    /**
-      If you have _all query disabled on Elastic search then this must be set to true
-      https://github.com/torkelo/grafana/issues/24
-    **/
-    elasticsearch_all_disabled: false,
     /**
      * graphite-web url:
      * For Basic authentication use: http://username:password@domain.com