diff --git a/modules/ui/fields/combo.js b/modules/ui/fields/combo.js
index 467be7a7e..c9a49d867 100644
--- a/modules/ui/fields/combo.js
+++ b/modules/ui/fields/combo.js
@@ -183,6 +183,13 @@ export function uiFieldCombo(field, context) {
             if (err) return;
 
             data = data.filter(function(d) {
+
+                if (field.type === 'typeCombo' && d.value === 'yes') {
+                    // don't show the fallback value
+                    return false;
+                }
+
+                // don't show values with very low usage
                 return !d.count || d.count > 10;
             });