diff --git a/src/components/input/DatePickerWithLabelFormGroup.tsx b/src/components/input/DatePickerWithLabelFormGroup.tsx
index be7e41522c..b6fc61f4b6 100644
--- a/src/components/input/DatePickerWithLabelFormGroup.tsx
+++ b/src/components/input/DatePickerWithLabelFormGroup.tsx
@@ -7,14 +7,15 @@ interface Props {
   value: Date | undefined
   isEditable?: boolean
   onChange?: (date: Date) => void
+  isRequired?: boolean
 }
 
 const DatePickerWithLabelFormGroup = (props: Props) => {
-  const { onChange, label, name, isEditable, value } = props
+  const { onChange, label, name, isEditable, value, isRequired } = props
   const id = `${name}DatePicker`
   return (
     <div className="form-group">
-      <Label text={label} htmlFor={id} />
+      <Label text={label} htmlFor={id} isRequired={isRequired} />
       <DateTimePicker
         dateFormat="MM/dd/yyyy"
         dateFormatCalendar="LLLL yyyy"
diff --git a/src/patients/diagnoses/AddDiagnosisModal.tsx b/src/patients/diagnoses/AddDiagnosisModal.tsx
index 311ebf7460..45592758bf 100644
--- a/src/patients/diagnoses/AddDiagnosisModal.tsx
+++ b/src/patients/diagnoses/AddDiagnosisModal.tsx
@@ -63,6 +63,7 @@ const AddDiagnosisModal = (props: Props) => {
                 placeholder={t('patient.diagnoses.diagnosisName')}
                 value={diagnosis.name}
                 onChange={onNameChange}
+                isRequired
               />
             </div>
           </div>
@@ -75,6 +76,7 @@ const AddDiagnosisModal = (props: Props) => {
               value={new Date(diagnosis.diagnosisDate)}
               isEditable
               onChange={onDiagnosisDateChange}
+              isRequired
             />
           </div>
         </div>