diff --git a/src/WaitForHelper.ts b/src/WaitForHelper.ts
index 281a95a45..bc0e27734 100644
--- a/src/WaitForHelper.ts
+++ b/src/WaitForHelper.ts
@@ -138,7 +138,13 @@ export class WaitForHelper {
       })
       .catch(error => logger(error));
 
-    await action();
+    try {
+      await action();
+    } catch (error) {
+      // Clear up pending promises
+      this.#abortController.abort();
+      throw error;
+    }
 
     try {
       await navigationFinished;