diff --git a/e2e/calculate-all-params.e2e-spec.ts b/e2e/calculate-all-params.e2e-spec.ts
index 5d0b9280a4a2d5e09d830927c18899208bfd9c83..f19c2f7d0351eaaa91e1988cd7e3a4946febb74a 100644
--- a/e2e/calculate-all-params.e2e-spec.ts
+++ b/e2e/calculate-all-params.e2e-spec.ts
@@ -74,7 +74,7 @@ describe("ngHyd − calculate all parameters of all calculators", () => {
                         const nbParamsCalc = await calcPage.getCheckedCalcModeButtons().count();
                         expect(nbParamsCalc).toBe(1);
                         // check that "compute" button is active
-                        const calcButton = calcPage.checkCalcButtonEnabled(true);
+                        const calcButton = await calcPage.checkCalcButtonEnabled(true);
                         // click "compute" button
                         await calcButton.click();
                         // check that result is not empty
@@ -84,7 +84,7 @@ describe("ngHyd − calculate all parameters of all calculators", () => {
                 } else {
                     // module has no calculable params, just click the "compute" button
                     // check that "compute" button is active
-                    const calcButton = calcPage.checkCalcButtonEnabled(true);
+                    const calcButton = await calcPage.checkCalcButtonEnabled(true);
                     // click "compute" button
                     await calcButton.click();
                     // check that result is not empty
diff --git a/e2e/calculate-button-validation.e2e-spec.ts b/e2e/calculate-button-validation.e2e-spec.ts
index f98e92093ec4e623de6b3ce89e4460daa8ea71f5..0f472f43eb1e0213cc34a18bf954a9bc5a2574b0 100644
--- a/e2e/calculate-button-validation.e2e-spec.ts
+++ b/e2e/calculate-button-validation.e2e-spec.ts
@@ -49,21 +49,21 @@ describe("Calculate button - ", () => {
         await browser.sleep(200);
 
         // check that "compute" button is inactive
-        calcPage.checkCalcButtonEnabled(false);
+        await calcPage.checkCalcButtonEnabled(false);
 
         // back to PAB: chute
         await navBar.clickCalculatorTab(0);
         await browser.sleep(200);
 
         // check that "compute" button is active
-        calcPage.checkCalcButtonEnabled(true);
+        await calcPage.checkCalcButtonEnabled(true);
 
         // back to PAB: dimensions
         await navBar.clickCalculatorTab(1);
         await browser.sleep(200);
 
         // check that "compute" button is inactive
-        calcPage.checkCalcButtonEnabled(false);
+        await calcPage.checkCalcButtonEnabled(false);
     });
 
     describe("check button status in prébarrages - ", () => {
@@ -83,7 +83,7 @@ describe("Calculate button - ", () => {
             await inputQ.sendKeys("-1");
             await browser.sleep(200);
 
-            calcPage.checkCalcButtonEnabled(false);
+            await calcPage.checkCalcButtonEnabled(false);
 
             // upstream item
             // look for g element with id starting by "flowchart-amont-"
@@ -120,7 +120,7 @@ describe("Calculate button - ", () => {
             await browser.sleep(200);
 
             // calculate button disabled ?
-            calcPage.checkCalcButtonEnabled(false);
+            await calcPage.checkCalcButtonEnabled(false);
 
             // upstream item displayed in error ?
             expect(await upstream.getAttribute('class')).toContain("node-highlighted-error"); // upstream item is now selected by default (was 'node-error')
@@ -132,7 +132,7 @@ describe("Calculate button - ", () => {
             await browser.sleep(200);
 
             // calculate button still disabled ? (the basin is not connected to anything)
-            calcPage.checkCalcButtonEnabled(false);
+            await calcPage.checkCalcButtonEnabled(false);
 
             // upstream item displayed not in error ?
             expect(await upstream.getAttribute('class')).not.toContain("node-error");
diff --git a/e2e/calculate-linked-params.e2e-spec.ts b/e2e/calculate-linked-params.e2e-spec.ts
index e7192eca98c55df921308709553571b0040f8626..f87d9b16877ea5d8d4d26833d2ef837ed20a4380 100644
--- a/e2e/calculate-linked-params.e2e-spec.ts
+++ b/e2e/calculate-linked-params.e2e-spec.ts
@@ -45,7 +45,7 @@ describe("ngHyd − calculate with linked parameters", () => {
 
     async function computeAndCheckPresenceOfResults() {
         // check that "compute" button is active
-        const calcButton = calcPage.checkCalcButtonEnabled(true);
+        const calcButton = await calcPage.checkCalcButtonEnabled(true);
         // click "compute" button
         await calcButton.click();
         // check that result is not empty
diff --git a/e2e/calculator.po.ts b/e2e/calculator.po.ts
index fa9dc5802177003b1b3e84077ae1f3de0ad9ec05..d7552190a253a1a4fad88b89c59d3508acda60ff 100644
--- a/e2e/calculator.po.ts
+++ b/e2e/calculator.po.ts
@@ -335,9 +335,9 @@ export class CalculatorPage {
     }
 
     // check that "compute" button is in given enabled/disabled state
-    checkCalcButtonEnabled(enabled: boolean) {
+    async checkCalcButtonEnabled(enabled: boolean) {
         const calcButton = this.getCalculateButton();
-        expect(calcButton.isEnabled()).toBe(enabled);
+        expect(await calcButton.isEnabled()).toBe(enabled);
         return calcButton;
     }
 
diff --git a/e2e/solveur.e2e-spec.ts b/e2e/solveur.e2e-spec.ts
index 6ca71d3c702d3f7a8917e2c4ac3cbb01ed89d91e..1b4740864c4e16447ba3c8aa1eed7a06a702474c 100644
--- a/e2e/solveur.e2e-spec.ts
+++ b/e2e/solveur.e2e-spec.ts
@@ -63,7 +63,7 @@ describe("Solveur - ", () => {
         expect(spV).toContain("Z2 - Cote aval (PAB : chute)");
 
         // check that "compute" button is active
-        const calcButton = calcPage.checkCalcButtonEnabled(true);
+        const calcButton = await calcPage.checkCalcButtonEnabled(true);
         // click "compute" button
         await calcButton.click();
         // check that result is not empty
@@ -113,7 +113,7 @@ describe("Solveur - ", () => {
         await calcPage.getInputById("Ytarget").sendKeys("318");
 
         // check that "compute" button is active
-        const calcButton = calcPage.checkCalcButtonEnabled(true);
+        const calcButton = await calcPage.checkCalcButtonEnabled(true);
         // click "compute" button
         await calcButton.click();
         // check that result is not empty
@@ -134,7 +134,7 @@ describe("Solveur - ", () => {
         expect(hasResultsClone1).toBe(false);
 
         // check that "compute" button is active
-        const calcButtonClone = calcPage.checkCalcButtonEnabled(true);
+        const calcButtonClone = await calcPage.checkCalcButtonEnabled(true);
         // click "compute" button
         await calcButtonClone.click();
         // check that result is not empty
diff --git a/e2e/valeurs-erronees.e2e-spec.ts b/e2e/valeurs-erronees.e2e-spec.ts
index 8580ae57e5de488e2f9e9a85ccb49d296746ab27..73f815a396c7d7d9fd07778e5c55e5349246528d 100644
--- a/e2e/valeurs-erronees.e2e-spec.ts
+++ b/e2e/valeurs-erronees.e2e-spec.ts
@@ -54,6 +54,6 @@ describe("ngHyd - check invalid values are removed - ", () => {
         expect(w).toEqual("");
 
         // check that "compute" button is disabled
-        calcPage.checkCalcButtonEnabled(false);
+        await calcPage.checkCalcButtonEnabled(false);
     });
 });