diff --git a/app/assets/javascripts/discourse/views/combo-box.js.es6 b/app/assets/javascripts/discourse/views/combo-box.js.es6
index 41a9f3deb61..fb37f5d4659 100644
--- a/app/assets/javascripts/discourse/views/combo-box.js.es6
+++ b/app/assets/javascripts/discourse/views/combo-box.js.es6
@@ -33,7 +33,7 @@ export default Discourse.View.extend({
     }
 
     var selected = this.get('value');
-    if (selected) { selected = selected.toString(); }
+    if (!Em.isNone(selected)) { selected = selected.toString(); }
 
     if (this.get('content')) {
       var self = this;