diff --git a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.html b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.html
index 35e78ad5d..bbd9d8aa2 100644
--- a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.html
+++ b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.html
@@ -57,7 +57,7 @@
 
             <div class="due-date">
                 <mat-checkbox
-                    (change)="hasDueDate = !hasDueDate"
+                    (change)="toggleDueDateField()"
                     [checked]="hasDueDate"
                     [disabled]="form.get('dueDate').disabled"
                     class="filter-menu-checkbox"
diff --git a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts
index 21a78a38c..1894b809a 100644
--- a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts
+++ b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts
@@ -106,18 +106,16 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti
             description: this.dossier.description,
             dueDate: this.dossier.dueDate,
         });
+        this.hasDueDate = !!this.dossier.dueDate;
     }
 
     async save(): EditDossierSaveResult {
-        let dueDate;
-        if (this.hasDueDate) {
-            dueDate = dateWithoutTime(dayjs(this.form.get('dueDate').value));
-        }
+        const dueDate = dateWithoutTime(dayjs(this.form.get('dueDate').value));
         const dossier = {
             ...this.dossier,
             dossierName: this.form.get('dossierName').value,
             description: this.form.get('description').value,
-            dueDate: dueDate,
+            dueDate: dueDate.isValid() ? dueDate.toISOString() : undefined,
             dossierTemplateId: this.form.get(DOSSIER_TEMPLATE_ID).value,
             dossierStatusId: this.form.get('dossierStatusId').value,
         } as IDossierRequest;
@@ -190,6 +188,13 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti
         return this._dossierStatesMapService.get(this.dossier.dossierTemplateId, stateId).color;
     }
 
+    toggleDueDateField() {
+        this.hasDueDate = !this.hasDueDate;
+        if (!this.hasDueDate) {
+            this.form.controls['dueDate'].setValue(null);
+        }
+    }
+
     async #closeDialogAndRedirectToDossier() {
         this._editDossierDialogRef.close();
         await this._router.navigate([this.dossier.dossiersListRouterLink]);