diff --git a/apps/files/src/components/TemplateFiller.vue b/apps/files/src/components/TemplateFiller.vue
index bd3c28d585ff6..9aa3617a3eb65 100644
--- a/apps/files/src/components/TemplateFiller.vue
+++ b/apps/files/src/components/TemplateFiller.vue
@@ -4,13 +4,18 @@
 -->
 
 <template>
-	<NcModal>
+	<NcModal label-id="template-field-modal__label">
 		<div class="template-field-modal__content">
 			<form>
-				<h3>{{ t('files', 'Fill template fields') }}</h3>
+				<h3 id="template-field-modal__label">
+					{{ t('files', 'Fill template fields') }}
+				</h3>
 
 				<div v-for="field in fields" :key="field.index">
-					<component :is="getFieldComponent(field.type)" :field="field" @input="trackInput" />
+					<component :is="getFieldComponent(field.type)"
+						v-if="fieldHasLabel(field)"
+						:field="field"
+						@input="trackInput" />
 				</div>
 			</form>
 		</div>
@@ -80,6 +85,9 @@ export default defineComponent({
 
 			return `Template${fieldComponentType}Field`
 		},
+		fieldHasLabel(field) {
+			return field.name || field.alias
+		},
 		async submit() {
 			this.loading = true
 
diff --git a/apps/files/src/components/TemplateFiller/TemplateCheckboxField.vue b/apps/files/src/components/TemplateFiller/TemplateCheckboxField.vue
index 632944f1babbf..d617fd9330399 100644
--- a/apps/files/src/components/TemplateFiller/TemplateCheckboxField.vue
+++ b/apps/files/src/components/TemplateFiller/TemplateCheckboxField.vue
@@ -40,7 +40,7 @@ export default defineComponent({
 
 	computed: {
 		fieldLabel() {
-			const label = this.field.name ?? this.field.alias ?? 'Unknown field'
+			const label = this.field.name || this.field.alias
 
 			return label.charAt(0).toUpperCase() + label.slice(1)
 		},
diff --git a/apps/files/src/components/TemplateFiller/TemplateRichTextField.vue b/apps/files/src/components/TemplateFiller/TemplateRichTextField.vue
index 7246b2743d692..1a4518b304b6e 100644
--- a/apps/files/src/components/TemplateFiller/TemplateRichTextField.vue
+++ b/apps/files/src/components/TemplateFiller/TemplateRichTextField.vue
@@ -45,7 +45,7 @@ export default defineComponent({
 
 	computed: {
 		fieldLabel() {
-			const label = this.field.name ?? this.field.alias ?? 'Unknown field'
+			const label = this.field.name || this.field.alias
 
 			return (label.charAt(0).toUpperCase() + label.slice(1))
 		},