diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.html b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.html
index 4d60d4b0f..609feea0f 100644
--- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.html
+++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.html
@@ -55,7 +55,7 @@
         <div class="flex fields-container">
             <div class="iqser-input-group w-300">
                 <label translate="edit-dossier-dialog.general-info.form.dossier-status.label"></label>
-                <mat-select [placeholder]="statusPlaceholder" [disabled]="states.length === 0" formControlName="dossierStatusId">
+                <mat-select [placeholder]="statusPlaceholder" formControlName="dossierStatusId">
                     <mat-option *ngFor="let state of states" [value]="state.dossierStatusId">
                         <div class="flex-align-items-center">
                             <redaction-small-chip [color]="state.color"></redaction-small-chip>
diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts
index a5b0c3a6a..b75cd1675 100644
--- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts
@@ -84,12 +84,12 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti
     }
 
     ngOnInit() {
+        this.states = this._dossierStateService.all.filter(s => s.dossierTemplateId === this.dossier.dossierTemplateId);
         this.#filterInvalidDossierTemplates();
         this.form = this.#getForm();
         if (!this.permissionsService.canEditDossier(this.dossier)) {
             this.form.disable();
         }
-        this.states = this._dossierStateService.all.filter(s => s.dossierTemplateId === this.dossier.dossierTemplateId);
         if (this.dossier.dossierStatusId) {
             this.currentStatus = this._dossierStateService.all.find(s => s.dossierStatusId === this.dossier.dossierStatusId);
         }
@@ -155,7 +155,7 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti
                 },
                 Validators.required,
             ],
-            dossierStatusId: [this.dossier.dossierStatusId],
+            dossierStatusId: [{ value: this.dossier.dossierStatusId, disabled: !this.states.length }],
             description: [this.dossier.description],
             dueDate: [this.dossier.dueDate],
             watermarkEnabled: [this.dossier.watermarkEnabled],