diff --git a/src/trait_manager/view/TraitSelectView.js b/src/trait_manager/view/TraitSelectView.js
index 3d60814e1..eaf774607 100644
--- a/src/trait_manager/view/TraitSelectView.js
+++ b/src/trait_manager/view/TraitSelectView.js
@@ -35,7 +35,10 @@ module.exports = TraitView.extend({
           value = el;
         } else {
           name = el.name ? el.name : el.value;
-          value = `${el.value || el.id}`.replace(/"/g, '"');
+          value = `${isUndefined(el.value) ? el.id : el.value}`.replace(
+            /"/g,
+            '"'
+          );
           style = el.style ? el.style.replace(/"/g, '"') : '';
           attrs += style ? ` style="${style}"` : '';
         }
diff --git a/src/trait_manager/view/TraitView.js b/src/trait_manager/view/TraitView.js
index 9ee74f165..d6943a946 100644
--- a/src/trait_manager/view/TraitView.js
+++ b/src/trait_manager/view/TraitView.js
@@ -107,7 +107,7 @@ module.exports = Backbone.View.extend({
       const value = this.getModelValue();
       const input = $(`<input type="${type}" placeholder="${plh}">`);
 
-      if (value) {
+      if (!isUndefined(value)) {
         md.set({ value }, { silent: true });
         input.prop('value', value);
       }