diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/debug/wait.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/debug/wait.ts
index e048720f29..321a5f46a8 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/debug/wait.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/debug/wait.ts
@@ -85,14 +85,11 @@ export function createWaitAction(options?: {
       }
 
       await new Promise(resolve => {
-        const controller = new AbortController();
         const timeoutHandle = setTimeout(abort, delayTime.toMillis());
-        ctx.signal?.addEventListener('abort', abort);
+        ctx.signal?.addEventListener('abort', abort, { once: true });
 
         function abort() {
-          ctx.signal?.removeEventListener('abort', abort);
-          clearTimeout(timeoutHandle!);
-          controller.abort();
+          clearTimeout(timeoutHandle);
           resolve('finished');
         }
       });