diff --git a/.changeset/cuddly-colts-dress.md b/.changeset/cuddly-colts-dress.md
index f7e24d1c54..5e541ebccb 100644
--- a/.changeset/cuddly-colts-dress.md
+++ b/.changeset/cuddly-colts-dress.md
@@ -2,4 +2,4 @@
 '@backstage/plugin-scaffolder-backend': patch
 ---
 
-Simplify abort handling in debug:wait action
+Remove unused abort controller in debug:wait action
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 321a5f46a8..73d81e50bf 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/debug/wait.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/debug/wait.ts
@@ -84,13 +84,14 @@ export function createWaitAction(options?: {
         );
       }
 
-      await new Promise(resolve => {
+      await new Promise<void>(resolve => {
         const timeoutHandle = setTimeout(abort, delayTime.toMillis());
-        ctx.signal?.addEventListener('abort', abort, { once: true });
+        ctx.signal?.addEventListener('abort', abort);
 
         function abort() {
+          ctx.signal?.removeEventListener('abort', abort);
           clearTimeout(timeoutHandle);
-          resolve('finished');
+          resolve();
         }
       });
     },