diff --git a/ui/dashboard/projects/utask-lib/src/lib/@routes/task/task.component.ts b/ui/dashboard/projects/utask-lib/src/lib/@routes/task/task.component.ts
index f5e412ef..eeb44193 100644
--- a/ui/dashboard/projects/utask-lib/src/lib/@routes/task/task.component.ts
+++ b/ui/dashboard/projects/utask-lib/src/lib/@routes/task/task.component.ts
@@ -133,8 +133,12 @@ export class TaskComponent implements OnInit, OnDestroy {
     return !!meta?.user_is_admin;
   }));
 
-  readonly canEditRequest$ = combineLatest([this.task$, this._isResolver$]).pipe(map(([task, isResolver]) => {
-    if (!['TODO', 'PAUSED'].includes(task?.state)) {
+  readonly canEditRequest$ = combineLatest([this.task$, this.resolution$, this._isResolver$]).pipe(map(([task, resolution, isResolver]) => {
+    if (!['TODO', 'DELAYED', 'PAUSED'].includes(task?.state)) {
+      return false;
+    }
+
+    if (!['TODO', 'PAUSED'].includes(resolution?.state)) {
       return false;
     }