diff --git a/src/app/components/settings.js b/src/app/components/settings.js
index 7ea1bd65087..b483007d25e 100644
--- a/src/app/components/settings.js
+++ b/src/app/components/settings.js
@@ -13,12 +13,13 @@ function (_, crypto) {
      * @type {Object}
      */
     var defaults = {
-      elasticsearch     : "http://"+window.location.hostname+":9200",
-      graphiteUrl       : "http://"+window.location.hostname+":8080",
-      panel_names       : [],
-      default_route     : '/dashboard/file/default.json',
-      grafana_index     : 'grafana-dash',
-      timezoneOffset    : null,
+      elasticsearch                 : "http://"+window.location.hostname+":9200",
+      graphiteUrl                   : "http://"+window.location.hostname+":8080",
+      panel_names                   : [],
+      default_route                 : '/dashboard/file/default.json',
+      grafana_index                 : 'grafana-dash',
+      elasticsearch_all_disabled    : false,
+      timezoneOffset                : null,
     };
 
     // This initializes a new hash on purpose, to avoid adding parameters to
diff --git a/src/app/services/dashboard.js b/src/app/services/dashboard.js
index aca885c3a90..71d55d120e5 100644
--- a/src/app/services/dashboard.js
+++ b/src/app/services/dashboard.js
@@ -387,13 +387,13 @@ function (angular, $, kbn, _, config, moment, Modernizr) {
 
     this.elasticsearch_list = function(query,count) {
       var request = ejs.Request().indices(config.grafana_index).types('dashboard');
+      var q = null;
+      if(config.elasticsearch_all_disabled==true){
+        q = ('title:' + (query || '*'))
+      }else{
+        q = (query || '*')
+      }
       return request.query(
-        var q = null;
-        if(config.elasticsearch_all_disabled){
-          q = ('title:' + (query || '*'))
-        }else{
-          q = (query || '*')
-        }
         ejs.QueryStringQuery(q)
         ).size(count).doSearch(
           // Success
diff --git a/src/config.js b/src/config.js
index a5cb7a30d34..84a66634464 100644
--- a/src/config.js
+++ b/src/config.js
@@ -15,6 +15,10 @@ 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: