diff --git a/app/assets/javascripts/admin/mixins/setting-object.js.es6 b/app/assets/javascripts/admin/mixins/setting-object.js.es6 index 2a85b8ae3fe..48c9528af78 100644 --- a/app/assets/javascripts/admin/mixins/setting-object.js.es6 +++ b/app/assets/javascripts/admin/mixins/setting-object.js.es6 @@ -24,7 +24,9 @@ export default Ember.Mixin.create({ }.property("valid_values"), allowsNone: function() { - if (_.indexOf(this.get("valid_values"), "") >= 0) + const validValues = this.get("valid_values"); + if (validValues && validValues.indexOf("") >= 0) { return "admin.settings.none"; + } }.property("valid_values") });