diff --git a/modules/ui/fields/combo.js b/modules/ui/fields/combo.js
index 346d063eb..744a1249e 100644
--- a/modules/ui/fields/combo.js
+++ b/modules/ui/fields/combo.js
@@ -210,6 +210,10 @@ export function uiFieldCombo(field, context) {
 
         _comboData = objectDifference(_comboData, _multiData);
         _combobox.data(_comboData);
+
+        // hide the caret if there are no suggestions
+        _container.classed('empty-combobox', _comboData.length === 0);
+
         if (callback) callback(_comboData);
     }