diff --git a/scm-ui/ui-api/src/useAutocompleteOptions.ts b/scm-ui/ui-api/src/useAutocompleteOptions.ts
index 7d9e9bef73..c579540d92 100644
--- a/scm-ui/ui-api/src/useAutocompleteOptions.ts
+++ b/scm-ui/ui-api/src/useAutocompleteOptions.ts
@@ -53,6 +53,7 @@ function useAutocompleteOptions(
               value: options.allowArbitraryValues(query),
               label: query,
               displayValue: t("form.combobox.arbitraryDisplayValue", { query }),
+              isArbitraryValue: true,
             });
           }
           return result;
diff --git a/scm-ui/ui-types/src/Option.ts b/scm-ui/ui-types/src/Option.ts
index 5ebf4672ab..031c523498 100644
--- a/scm-ui/ui-types/src/Option.ts
+++ b/scm-ui/ui-types/src/Option.ts
@@ -21,4 +21,9 @@ export type Option<T> = {
    * Takes precedence over the label in alternative selection modes (i.e. popups in combo-boxes).
    */
   displayValue?: string;
+
+  /**
+   * If this flag is true, then the option value, does not actually exist in any data source. For example in the backend.
+   */
+  isArbitraryValue?: boolean;
 };