diff --git a/library-compose/src/main/java/com/spendesk/grapes/compose/calendar/GrapesDatePickerDialog.kt b/library-compose/src/main/java/com/spendesk/grapes/compose/calendar/GrapesDatePickerDialog.kt
index a47db16a..5214cf6a 100644
--- a/library-compose/src/main/java/com/spendesk/grapes/compose/calendar/GrapesDatePickerDialog.kt
+++ b/library-compose/src/main/java/com/spendesk/grapes/compose/calendar/GrapesDatePickerDialog.kt
@@ -21,7 +21,7 @@ fun GrapesDatePickerDialog(
     shape: Shape = GrapesTheme.shapes.shape2,
     dismissOnBack: Boolean = true,
     dismissOnClickOutside: Boolean = true,
-    yearRange: IntRange = GrapesDatePickerDefaults.YearRange,
+    yearRange: IntRange? = null,
     confirmButton: @Composable () -> Unit = { },
     dismissButton: (@Composable () -> Unit)? = null,
     onDismissRequest: (() -> Unit)? = null,
@@ -39,7 +39,7 @@ fun GrapesDatePickerDialog(
         ),
         content = {
             GrapesDatePicker(
-                yearRange = yearRange,
+                yearRange = yearRange ?: GrapesDatePickerDefaults.YearRange,
                 initialDisplayedDate = initialDisplayedDate,
                 onDateSelected = { date -> onDateSelected(date) }
             )