diff --git a/src/Date/Calendar.tsx b/src/Date/Calendar.tsx
index a0693b1c..22b8352c 100644
--- a/src/Date/Calendar.tsx
+++ b/src/Date/Calendar.tsx
@@ -210,8 +210,8 @@ function Calendar(
           selectedYear={selectedYear}
           selectingYear={selectingYear}
           onPressYear={onPressYear}
-          startYear={startYear ?? 1800}
-          endYear={endYear ?? 2200}
+          startYear={startYear || 1800}
+          endYear={endYear || 2200}
         />
       ) : null}
     </View>
diff --git a/src/Date/DatePickerModalContent.tsx b/src/Date/DatePickerModalContent.tsx
index fa92e555..5a52898b 100644
--- a/src/Date/DatePickerModalContent.tsx
+++ b/src/Date/DatePickerModalContent.tsx
@@ -144,8 +144,8 @@ export function DatePickerModalContent(
           onSave={onInnerConfirm}
           onDismiss={onDismiss}
           saveLabel={props.saveLabel}
-          saveLabelDisabled={props.saveLabelDisabled ?? false}
-          uppercase={props.uppercase ?? true}
+          saveLabelDisabled={props.saveLabelDisabled || false}
+          uppercase={props.uppercase || true}
           disableSafeTop={disableSafeTop}
           closeIcon={props.closeIcon}
         />
@@ -160,7 +160,7 @@ export function DatePickerModalContent(
           moreLabel={props.moreLabel}
           startLabel={props.startLabel}
           endLabel={props.endLabel}
-          uppercase={props.uppercase ?? true}
+          uppercase={props.uppercase || true}
           locale={locale}
           editIcon={props.editIcon}
           calendarIcon={props.calendarIcon}
diff --git a/src/Date/DatePickerModalHeader.tsx b/src/Date/DatePickerModalHeader.tsx
index e3c87872..13e8e5b6 100644
--- a/src/Date/DatePickerModalHeader.tsx
+++ b/src/Date/DatePickerModalHeader.tsx
@@ -43,8 +43,8 @@ export default function DatePickerModalHeader(
             <Button
               color={color}
               onPress={props.onSave}
-              disabled={props.saveLabelDisabled ?? false}
-              uppercase={props.uppercase ?? true}
+              disabled={props.saveLabelDisabled || false}
+              uppercase={props.uppercase || true}
               testID="react-native-paper-dates-save"
             >
               {saveLabel}