diff --git a/src/app/components/generic-calculator/calculator.component.html b/src/app/components/generic-calculator/calculator.component.html
index 79dec21bc868caa7628a25a8a0e9cf6b3d50cee3..d8f4056d33d43a3f6157bab33dfb66a289b0792c 100644
--- a/src/app/components/generic-calculator/calculator.component.html
+++ b/src/app/components/generic-calculator/calculator.component.html
@@ -214,7 +214,7 @@
                     </button>
 
                     <button mat-raised-button color="accent" id="generate-backwater-curve" *ngIf="isPAM"
-                        (click)="generateBackwaterInPAM()">
+                        (click)="generateBackwaterInPAM()" [disabled]="!generateCrPamEnabled">
                         {{ uitextGenerateBackwaterInPAM }}
                     </button>
 
diff --git a/src/app/components/generic-calculator/calculator.component.ts b/src/app/components/generic-calculator/calculator.component.ts
index 7c249e932dd2f5ed3e05e219e8eaf0943546e6a6..0228b5f3c99f846caf44ba1e198865e4db7ced57 100644
--- a/src/app/components/generic-calculator/calculator.component.ts
+++ b/src/app/components/generic-calculator/calculator.component.ts
@@ -1030,6 +1030,10 @@ export class GenericCalculatorComponent implements OnInit, DoCheck, AfterViewChe
         );
     }
 
+    public get generateCrPamEnabled(): boolean {
+        return this.hasResults && !this._formulaire.currentNub.result.hasErrorMessages();
+    }
+
     public get uitextGenerateParSimulationTitle(): string {
         const parCalage = (this._formulaire.currentNub as Par);
         if (!this.hasResults || parCalage.result.hasErrorMessages()) {