diff --git a/apps/systemtags/src/components/SystemTagForm.vue b/apps/systemtags/src/components/SystemTagForm.vue
index 24bf5c872bf8f..8bc2c75505bca 100644
--- a/apps/systemtags/src/components/SystemTagForm.vue
+++ b/apps/systemtags/src/components/SystemTagForm.vue
@@ -230,11 +230,12 @@ function getTagLevel(userVisible: boolean, userAssignable: boolean): TagLevel {
 		<div class="system-tag-form__group">
 			<label for="system-tags-input">{{ t('systemtags', 'Search for a tag to edit') }}</label>
 			<NcSelectTags
-				:modelValue="selectedTag"
+				:modelValue="selectedTag?.id ?? null"
 				inputId="system-tags-input"
 				:placeholder="t('systemtags', 'Collaborative tags …')"
 				:fetchTags="false"
 				:options="tags"
+				:limit="null"
 				:multiple="false"
 				labelOutside
 				@update:modelValue="onSelectTag">