diff --git a/modules/ui/fields/combo.js b/modules/ui/fields/combo.js
index 17e2c50cd..245b14825 100644
--- a/modules/ui/fields/combo.js
+++ b/modules/ui/fields/combo.js
@@ -491,6 +491,7 @@ export function uiFieldCombo(field, context) {
     }
 
     function updateIcon(value) {
+        value = tagValue(value);
         if (valueIcons[field.key]) {
             _container.selectAll('.tag-value-icon').remove();
             var iconSelector = _container.selectAll('.tag-value-icon')