diff --git a/src/components/Activities/ReportTask.jsx b/src/components/Activities/ReportTask.jsx
index 5c618215..58d8ccd5 100644
--- a/src/components/Activities/ReportTask.jsx
+++ b/src/components/Activities/ReportTask.jsx
@@ -19,7 +19,6 @@ export const ReportTask = ({ report, closeModal, refetch }) => {
       .max(maxPending, {
         message: `Completed task cannot exceed total pending tasks:  ${maxPending}`,
       })
-      .positive("Completed Work must be a positive number")
       .optional(),
     comment: z.string().min(1, "Comment cannot be empty"),
   });
diff --git a/src/pages/Activities/DailyTask.jsx b/src/pages/Activities/DailyTask.jsx
index 78109a8f..0c98dd26 100644
--- a/src/pages/Activities/DailyTask.jsx
+++ b/src/pages/Activities/DailyTask.jsx
@@ -318,7 +318,7 @@ const DailyTask = () => {
                                     <button
                                       type="button"
                                       className={`btn btn-xs btn-primary ${
-                                        task.completedTask > 0 ? "d-none" : ""
+                                        task.reportedDate != null ? "d-none" : ""
                                       }`}
                                       onClick={() => {
                                         selectTask(task);