diff --git a/app/assets/javascripts/discourse/components/combo-box.js.es6 b/app/assets/javascripts/discourse/components/combo-box.js.es6
index b33a2ace2..625361550 100644
--- a/app/assets/javascripts/discourse/components/combo-box.js.es6
+++ b/app/assets/javascripts/discourse/components/combo-box.js.es6
@@ -69,7 +69,7 @@ export default Ember.Component.extend({
     const castInteger = this.get('castInteger');
     $elem.on("change", function (e) {
       let val = $(e.target).val();
-      if (val.length && castInteger) {
+      if (val && val.length && castInteger) {
         val = parseInt(val, 10);
       }
       self.set('value', val);