diff --git a/src/app/api/timesheets/utils.ts b/src/app/api/timesheets/utils.ts
index 82f06c9..d5cb15f 100644
--- a/src/app/api/timesheets/utils.ts
+++ b/src/app/api/timesheets/utils.ts
@@ -47,7 +47,7 @@ export const validateTimeEntry = (
   } else {
     if (entry.taskGroupId && !entry.taskId) {
       error.taskId = "Required";
-    } else if (!entry.remark) {
+    } else if (!entry.taskGroupId && !entry.remark) {
       error.remark = "Required for non-billable tasks";
     }
   }
diff --git a/src/components/TimesheetTable/TimesheetEditModal.tsx b/src/components/TimesheetTable/TimesheetEditModal.tsx
index cdda1fa..1becac6 100644
--- a/src/components/TimesheetTable/TimesheetEditModal.tsx
+++ b/src/components/TimesheetTable/TimesheetEditModal.tsx
@@ -304,7 +304,7 @@ const TimesheetEditModal: React.FC<Props> = ({
           error={Boolean(formState.errors.remark)}
           {...register("remark", {
             validate: (value) =>
-              Boolean(projectId || value) ||
+              Boolean(projectId || taskGroupId || value) ||
               t("Required for non-billable tasks"),
           })}
           helperText={formState.errors.remark?.message}