diff --git a/lib/data/models/task_model.dart b/lib/data/models/task_model.dart
index 0c8a7d9b3..5cd879f5d 100644
--- a/lib/data/models/task_model.dart
+++ b/lib/data/models/task_model.dart
@@ -421,9 +421,27 @@ abstract class TaskEntity extends Object
       return false;
     }
 
-    final date = convertDateTimeToSqlDate(taskTimes.first.startDate.toLocal());
+    final taskStartDate =
+        convertDateTimeToSqlDate(taskTimes.first.startDate.toLocal());
+    if (startDate.compareTo(taskStartDate) <= 0 &&
+        endDate.compareTo(taskStartDate) >= 0) {
+      return true;
+    }
 
-    return startDate.compareTo(date) <= 0 && endDate.compareTo(date) >= 0;
+    final completedTimes = taskTimes.where((element) => !element.isRunning);
+
+    if (completedTimes.isNotEmpty) {
+      final lastTaskTime = completedTimes.last;
+      final taskEndDate =
+          convertDateTimeToSqlDate(lastTaskTime.endDate.toLocal());
+
+      if (startDate.compareTo(taskEndDate) <= 0 &&
+          endDate.compareTo(taskEndDate) >= 0) {
+        return true;
+      }
+    }
+
+    return false;
   }
 
   int get startTimestamp {