diff --git a/src/app/features/tasks/task/task.component.html b/src/app/features/tasks/task/task.component.html
index aa7472a961..96ade55e05 100644
--- a/src/app/features/tasks/task/task.component.html
+++ b/src/app/features/tasks/task/task.component.html
@@ -247,7 +247,7 @@
               [innerHTML]="t.dueWithTime | shortPlannedAt"
             ></div>
           </button>
-        } @else if (t.dueDay) {
+        } @else if (t.dueDay && isShowDueToday()) {
           <button
             (click)="scheduleTask()"
             [title]="T.F.TASK.CMP.EDIT_SCHEDULED | translate"
diff --git a/src/app/features/tasks/task/task.component.ts b/src/app/features/tasks/task/task.component.ts
index 283c305b3a..2551f2906a 100644
--- a/src/app/features/tasks/task/task.component.ts
+++ b/src/app/features/tasks/task/task.component.ts
@@ -172,6 +172,10 @@ export class TaskComponent implements OnDestroy, AfterViewInit {
     );
   });
 
+  isShowDueToday = computed(() => {
+    return !this.isOnTodayList() || !environment.production;
+  });
+
   progress = computed<number>(() => {
     const t = this.task();
     return (t.timeEstimate && (t.timeSpent / t.timeEstimate) * 100) || 0;