diff --git a/apps/red-ui/src/app/modules/admin/screens/component-mappings/add-edit-component-mapping-dialog/add-edit-component-mapping-dialog.component.ts b/apps/red-ui/src/app/modules/admin/screens/component-mappings/add-edit-component-mapping-dialog/add-edit-component-mapping-dialog.component.ts
index 28c4fd351..cef6b2bdd 100644
--- a/apps/red-ui/src/app/modules/admin/screens/component-mappings/add-edit-component-mapping-dialog/add-edit-component-mapping-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/admin/screens/component-mappings/add-edit-component-mapping-dialog/add-edit-component-mapping-dialog.component.ts
@@ -63,9 +63,10 @@ export class AddEditComponentMappingDialogComponent
     async ngOnInit() {
         if (this.data.mapping?.fileName) {
             this.activeFile = { name: this.data.mapping.fileName } as File;
-            const file = await firstValueFrom(
+            const fileContent = await firstValueFrom(
                 this._componentMappingService.getComponentMappingFile(this.data.dossierTemplateId, this.data.mapping.id),
             );
+            const file = new Blob([fileContent.body as Blob], { type: 'text/csv' });
             this.form.get('file').setValue(file);
             this.initialFormValue = this.form.getRawValue();
         }
diff --git a/apps/red-ui/src/app/services/entity-services/component-mappings.service.ts b/apps/red-ui/src/app/services/entity-services/component-mappings.service.ts
index b124f0681..a665779dc 100644
--- a/apps/red-ui/src/app/services/entity-services/component-mappings.service.ts
+++ b/apps/red-ui/src/app/services/entity-services/component-mappings.service.ts
@@ -22,7 +22,7 @@ export class ComponentMappingsService extends EntitiesService<IComponentMapping,
         file: Blob,
     ): Observable<IComponentMapping> {
         const formParams = new FormData();
-        formParams.append('file', file);
+        formParams.append('file', file, `${componentMapping.name}.csv`);
 
         const queryParams: List<QueryParam> = [
             { key: 'name', value: componentMapping.name },