diff --git a/app/api/leantime/tasks/route.ts b/app/api/leantime/tasks/route.ts
index f73d28c1..a99c0513 100644
--- a/app/api/leantime/tasks/route.ts
+++ b/app/api/leantime/tasks/route.ts
@@ -161,28 +161,10 @@ export async function GET(request: NextRequest) {
           dependingTicketId: task.dependingTicketId
         });
 
-        // If it's a main task and it's Done (status 5), filter it out
-        if (!task.type || task.type !== 'subtask') {
-          if (task.status === 5) {
-            console.log(`Filtering out completed main task ${task.id} (status: ${task.status})`);
-            return false;
-          }
-        }
-
-        // For subtasks, check if their parent task is Done (status 5)
-        if (task.type === 'subtask' && task.dependingTicketId) {
-          const parentTask = data.result.find((t: any) => t.id === task.dependingTicketId);
-          if (parentTask) {
-            console.log(`Found parent task for ${task.id}:`, {
-              parentId: parentTask.id,
-              parentHeadline: parentTask.headline,
-              parentStatus: parentTask.status
-            });
-          }
-          if (parentTask && parentTask.status === 5) {
-            console.log(`Filtering out subtask ${task.id} because parent task ${task.dependingTicketId} is Done (status: ${parentTask.status})`);
-            return false;
-          }
+        // Filter out any task (main or subtask) that has status Done (5)
+        if (task.status === 5) {
+          console.log(`Filtering out Done task ${task.id} (type: ${task.type || 'main'}, status: ${task.status})`);
+          return false;
         }
 
         // Convert both to strings for comparison to handle any type mismatches
diff --git a/components/flow.tsx b/components/flow.tsx
index 0d49ece0..99075184 100644
--- a/components/flow.tsx
+++ b/components/flow.tsx
@@ -106,29 +106,17 @@ export function Duties() {
         return;
       }
 
-      // Filter out parent tasks with status Done (5) and sort by dateToFinish
+      // Filter out tasks with status Done (5) and sort by dateToFinish
       const sortedTasks = data
         .filter((task: Task) => {
-          // If it's a main task and it's Done (status 5), filter it out
-          if (!task.type || task.type !== 'subtask') {
-            const isMainTaskActive = task.status !== 5;
-            if (!isMainTaskActive) {
-              console.log(`Filtering out completed main task ${task.id} (status: ${task.status})`);
-            }
-            return isMainTaskActive;
+          // Filter out any task (main or subtask) that has status Done (5)
+          const isNotDone = task.status !== 5;
+          if (!isNotDone) {
+            console.log(`Filtering out Done task ${task.id} (type: ${task.type || 'main'}, status: ${task.status})`);
+          } else {
+            console.log(`Keeping task ${task.id}: status=${task.status} (${getStatusLabel(task.status)}), type=${task.type || 'main'}`);
           }
-          
-          // For subtasks, check if their parent task is Done (status 5)
-          if (task.type === 'subtask' && task.dependingTicketId) {
-            const parentTask = data.find(t => t.id === task.dependingTicketId);
-            if (parentTask && parentTask.status === 5) {
-              console.log(`Filtering out subtask ${task.id} because parent task ${task.dependingTicketId} is Done (status: ${parentTask.status})`);
-              return false;
-            }
-          }
-          
-          console.log(`Keeping task ${task.id}: status=${task.status} (${getStatusLabel(task.status)}), type=${task.type}, parentId=${task.dependingTicketId || 'none'}`);
-          return true;
+          return isNotDone;
         })
         .sort((a: Task, b: Task) => {
           // First sort by dateToFinish (oldest first)