diff --git a/ui-core/src/components/inputs/ComboBox/ComboBox.tsx b/ui-core/src/components/inputs/ComboBox/ComboBox.tsx
index 1e39cc3a..3b48189a 100644
--- a/ui-core/src/components/inputs/ComboBox/ComboBox.tsx
+++ b/ui-core/src/components/inputs/ComboBox/ComboBox.tsx
@@ -188,7 +188,7 @@ const ComboBox = <T,>({
               key={`${getSuggestionLabel(suggestion)}-${index}`}
               className={cx('suggestion-item', {
                 active: index === activeSuggestionIndex,
-                selected: value === suggestion,
+                selected: value && getSuggestionLabel(value) === getSuggestionLabel(suggestion),
                 small,
               })}
               onClick={() => selectSuggestion(index)}