diff --git a/src/app/components/dialog-generate-pab/dialog-generate-pab.component.ts b/src/app/components/dialog-generate-pab/dialog-generate-pab.component.ts
index 9634a342bf3e3109f3670613af3adbb00a7cb1ff..65454306a07d4162b4a1756d6c0cfb22f4ace63f 100644
--- a/src/app/components/dialog-generate-pab/dialog-generate-pab.component.ts
+++ b/src/app/components/dialog-generate-pab/dialog-generate-pab.component.ts
@@ -29,21 +29,22 @@ export class DialogGeneratePABComponent {
         @Inject(MAT_DIALOG_DATA) public data: any
     ) {
         const nDigits = this.appSetupService.displayPrecision;
-        this.coteAmont = round(data.coteAmont, nDigits);
-        this.debit = round(data.debit, nDigits);
+        this.coteAmont = data.coteAmont ? round(data.coteAmont, nDigits) : undefined;
+        this.debit = data.debit ? round(data.debit, nDigits) : undefined;
         this.chute = round(data.chute, nDigits);
+        this.nbBassins = data.nbBassins;
     }
 
     public generatePAB() {
         // calculate downstream elevation
-        const coteAval = this.coteAmont - (this.chute * this.nbBassins);
+        const coteAval = +this.coteAmont - (this.chute * +this.nbBassins);
         // create PAB
         this.dialogRef.close({
             generate: true,
-            debit: this.debit,
-            coteAmont: this.coteAmont,
+            debit: +this.debit,
+            coteAmont: +this.coteAmont,
             coteAval: coteAval,
-            nbBassins: this.nbBassins
+            nbBassins: +this.nbBassins
         });
     }
 
diff --git a/src/app/components/generic-calculator/calculator.component.ts b/src/app/components/generic-calculator/calculator.component.ts
index 2608ce76e149a26609f9fc4f60194b0f0b1c3fbb..1957962103d6e56b42a5f477760d8fecdef1abe8 100644
--- a/src/app/components/generic-calculator/calculator.component.ts
+++ b/src/app/components/generic-calculator/calculator.component.ts
@@ -58,6 +58,7 @@ import { MatomoTracker } from "ngx-matomo";
 import { sprintf } from "sprintf-js";
 
 import * as XLSX from "xlsx";
+import { ServiceFactory } from "app/services/service-factory";
 
 @Component({
     selector: "hydrocalc",
@@ -731,13 +732,18 @@ export class GenericCalculatorComponent implements OnInit, DoCheck, AfterViewChe
     public generatePAB() {
         // création du dialogue de génération d'une passe à bassin
         const cloisons = (this._formulaire.currentNub as Cloisons);
+        const chute = cloisons.prms.DH.V;
+        const debit = cloisons.prms.Q.V;
+        const zAmont = cloisons.prms.Z1.V;
+        const nbBassins = ServiceFactory.applicationSetupService.enableEmptyFieldsOnFormInit ? undefined : 6;
         const dialogRef = this.generatePABDialog.open(
           DialogGeneratePABComponent,
           {
             data: {
-                chute: cloisons.prms.DH.V,
-                debit: cloisons.prms.Q.V,
-                coteAmont: cloisons.prms.Z1.V
+                  chute: chute,
+                  debit: debit,
+                  coteAmont: zAmont,
+                  nbBassins: nbBassins
             },
             disableClose: false
           }