diff --git a/src/components/Form/fields/FieldRorAutosuggest.vue b/src/components/Form/fields/FieldRorAutosuggest.vue
index d5c3ef8a9..b7413c559 100644
--- a/src/components/Form/fields/FieldRorAutosuggest.vue
+++ b/src/components/Form/fields/FieldRorAutosuggest.vue
@@ -54,7 +54,7 @@
 </template>
 
 <script setup>
-import {ref, watch, computed} from 'vue';
+import {ref, watch, computed, provide} from 'vue';
 import Autosuggest from './Autosuggest.vue';
 import Icon from '@/components/Icon/Icon.vue';
 import {useFetch} from '@/composables/useFetch';
@@ -70,6 +70,8 @@ const queryParams = computed(() => ({
 	query: inputValue.value,
 }));
 
+provide('allowCustom', true);
+
 const autosuggestContainerId = generateId();
 
 const {
@@ -127,6 +129,17 @@ function changeFocus(focused) {
 }
 
 function handleSelect(suggestion) {
+	if (!suggestion) {
+		if (!inputValue.value || !mappedSuggestions.value.length) {
+			return;
+		}
+
+		suggestion = {
+			value: inputValue.value,
+			label: inputValue.value,
+		};
+	}
+
 	if (!currentSelected.value.some((item) => item.value === suggestion.value)) {
 		currentSelected.value.push(suggestion);
 	}