diff --git a/src/kibana/plugins/settings/sections/advanced/advanced_row.html b/src/kibana/plugins/settings/sections/advanced/advanced_row.html
index 15bae0d1d1a12..a79b257167fa2 100644
--- a/src/kibana/plugins/settings/sections/advanced/advanced_row.html
+++ b/src/kibana/plugins/settings/sections/advanced/advanced_row.html
@@ -40,7 +40,6 @@
       <input
         ng-show="conf.bool"
         ng-model="conf.unsavedValue"
-        ng-checked="conf.unsavedValue === undefined ? conf.defVal : conf.unsavedValue"
         type="checkbox"
         class="form-control">
     </form>
diff --git a/src/kibana/plugins/settings/sections/advanced/advanced_row.js b/src/kibana/plugins/settings/sections/advanced/advanced_row.js
index ba89ec33f7cc1..78cd80d26e317 100644
--- a/src/kibana/plugins/settings/sections/advanced/advanced_row.js
+++ b/src/kibana/plugins/settings/sections/advanced/advanced_row.js
@@ -38,7 +38,7 @@ define(function (require) {
         };
 
         $scope.edit = function (conf) {
-          conf.unsavedValue = conf.value || conf.defVal;
+          conf.unsavedValue = conf.value == null ? conf.defVal : conf.value;
           $scope.configs.forEach(function (c) {
             c.editting = (c === conf);
           });