diff --git a/plugins/scaffolder/src/components/OngoingTask/OngoingTask.tsx b/plugins/scaffolder/src/components/OngoingTask/OngoingTask.tsx index 1e2031ce1b..efa34d6c65 100644 --- a/plugins/scaffolder/src/components/OngoingTask/OngoingTask.tsx +++ b/plugins/scaffolder/src/components/OngoingTask/OngoingTask.tsx @@ -247,7 +247,7 @@ export const OngoingTask = (props: { className={classes.cancelButton} disabled={ !cancelEnabled || - cancelStatus !== 'not-executed' || + (cancelStatus !== 'not-executed' && !isRetryableTask) || !canCancelTask } onClick={triggerCancel}