diff --git a/frontend/src/app/boards/[boardId]/edit/page.tsx b/frontend/src/app/boards/[boardId]/edit/page.tsx
index b68aa37f..379e09c8 100644
--- a/frontend/src/app/boards/[boardId]/edit/page.tsx
+++ b/frontend/src/app/boards/[boardId]/edit/page.tsx
@@ -503,6 +503,7 @@ export default function EditBoardPage() {
     boardGroupId ?? baseBoard?.board_group_id ?? "none";
   const resolvedBoardType = boardType ?? baseBoard?.board_type ?? "goal";
   const resolvedObjective = objective ?? baseBoard?.objective ?? "";
+  const isGoalFieldsRequired = resolvedBoardType === "goal";
   const resolvedRequireApprovalForDone =
     requireApprovalForDone ?? baseBoard?.require_approval_for_done ?? true;
   const resolvedRequireReviewBeforeDone =
@@ -914,6 +915,9 @@ export default function EditBoardPage() {
                 <div className="space-y-2">
                   <label className="text-sm font-medium text-slate-900">
                     Objective
+                    {isGoalFieldsRequired && (
+                      <span className="text-red-500"> *</span>
+                    )}
                   </label>
                   <Textarea
                     value={resolvedObjective}
@@ -927,6 +931,9 @@ export default function EditBoardPage() {
                 <div className="space-y-2">
                   <label className="text-sm font-medium text-slate-900">
                     Success metrics (JSON)
+                    {isGoalFieldsRequired && (
+                      <span className="text-red-500"> *</span>
+                    )}
                   </label>
                   <Textarea
                     value={resolvedSuccessMetrics}