diff --git a/src/Date/Swiper.tsx b/src/Date/Swiper.tsx
index 4f77f964..a71e0f2b 100644
--- a/src/Date/Swiper.tsx
+++ b/src/Date/Swiper.tsx
@@ -5,7 +5,11 @@ import {
   getVerticalMonthsOffset,
   montHeaderHeight,
 } from './Month'
-import { beginOffset, estimatedMonthHeight, totalMonths } from './dateUtils'
+import {
+  getBeginOffset,
+  estimatedMonthHeight,
+  getTotalMonths,
+} from './dateUtils'
 import { useLatest } from '../shared/utils'
 import {
   RenderProps,
@@ -115,7 +119,9 @@ function Swiper({
   )
 }
 
-const visibleArray = (i: number) => [i - 2, i - 1, i, i + 1, i + 2]
+const visibleArray = (i: number) => {
+  return [i - 2, i - 1, i, i + 1, i + 2]
+}
 
 function VerticalScroller({
   width,
@@ -136,19 +142,22 @@ function VerticalScroller({
   startYear?: number
   endYear?: number
 }) {
+  // Provide default values for startYear and endYear
+  const effectiveStartYear = startYear || 1800
+  const effectiveEndYear = endYear || 2200
   // Ensure initial index is within allowed range
   const constrainedInitialIndex = isIndexWithinRange(
     initialIndex,
-    startYear,
-    endYear
+    effectiveStartYear,
+    effectiveEndYear
   )
     ? initialIndex
     : Math.max(
-        Math.min(initialIndex, getMaxIndex(endYear)),
-        getMinIndex(startYear)
+        Math.min(initialIndex, getMaxIndex(effectiveEndYear)),
+        getMinIndex(effectiveStartYear)
       )
 
-  const [visibleIndexes, setVisibleIndexes] = useState<number[]>(
+  const [visibleIndexes, setVisibleIndexes] = useState<number[]>(() =>
     visibleArray(constrainedInitialIndex)
   )
 
@@ -161,7 +170,12 @@ function VerticalScroller({
       return
     }
     const top =
-      getVerticalMonthsOffset(idx.current, startWeekOnMonday) - montHeaderHeight
+      getVerticalMonthsOffset(
+        idx.current,
+        startWeekOnMonday,
+        effectiveStartYear,
+        effectiveEndYear
+      ) - montHeaderHeight
 
     element.scrollTo({
       top,
@@ -177,11 +191,20 @@ function VerticalScroller({
         return
       }
 
-      const offset = top - beginOffset
-      const index = getIndexFromVerticalOffset(offset, startWeekOnMonday)
+      const dynamicBeginOffset = getBeginOffset(
+        effectiveStartYear,
+        effectiveEndYear
+      )
+      const offset = top - dynamicBeginOffset
+      const index = getIndexFromVerticalOffset(
+        offset,
+        startWeekOnMonday,
+        effectiveStartYear,
+        effectiveEndYear
+      )
 
       // Check if the new index is within allowed range
-      if (!isIndexWithinRange(index, startYear, endYear)) {
+      if (!isIndexWithinRange(index, effectiveStartYear, effectiveEndYear)) {
         return
       }
 
@@ -190,7 +213,12 @@ function VerticalScroller({
         setVisibleIndexesThrottled(visibleArray(index))
       }
     },
-    [setVisibleIndexesThrottled, startWeekOnMonday, startYear, endYear]
+    [
+      setVisibleIndexesThrottled,
+      startWeekOnMonday,
+      effectiveStartYear,
+      effectiveEndYear,
+    ]
   )
 
   return (
@@ -207,37 +235,53 @@ function VerticalScroller({
       <div
         // eslint-disable-next-line react-native/no-inline-styles
         style={{
-          height: estimatedHeight * totalMonths,
+          height:
+            estimatedHeight *
+            getTotalMonths(effectiveStartYear, effectiveEndYear),
           position: 'relative',
         }}
       >
-        {[0, 1, 2, 3, 4].map((vi) => (
-          <div
-            key={vi}
-            // eslint-disable-next-line react-native/no-inline-styles
-            style={{
-              willChange: 'transform',
-              transform: `translateY(${getVerticalMonthsOffset(
-                visibleIndexes[vi],
-                startWeekOnMonday
-              )}px)`,
-              left: 0,
-              right: 0,
-              position: 'absolute',
-              height: getMonthHeight(
-                'vertical',
-                visibleIndexes[vi],
-                startWeekOnMonday
-              ),
-            }}
-          >
-            {renderItem({
-              index: visibleIndexes[vi],
-              onPrev: empty,
-              onNext: empty,
-            })}
-          </div>
-        ))}
+        {[0, 1, 2, 3, 4]
+          .map((vi) => {
+            const monthIndex = visibleIndexes[vi]
+
+            if (monthIndex === undefined) {
+              return null
+            }
+
+            return (
+              <div
+                key={vi}
+                // eslint-disable-next-line react-native/no-inline-styles
+                style={{
+                  willChange: 'transform',
+                  transform: `translateY(${getVerticalMonthsOffset(
+                    monthIndex,
+                    startWeekOnMonday,
+                    effectiveStartYear,
+                    effectiveEndYear
+                  )}px)`,
+                  left: 0,
+                  right: 0,
+                  position: 'absolute',
+                  height: getMonthHeight(
+                    'vertical',
+                    monthIndex,
+                    startWeekOnMonday,
+                    effectiveStartYear,
+                    effectiveEndYear
+                  ),
+                }}
+              >
+                {renderItem({
+                  index: monthIndex,
+                  onPrev: empty,
+                  onNext: empty,
+                })}
+              </div>
+            )
+          })
+          .filter((item) => item !== null)}
       </div>
     </div>
   )
diff --git a/src/__tests__/Date/__snapshots__/CalendarEdit.test.tsx.snap b/src/__tests__/Date/__snapshots__/CalendarEdit.test.tsx.snap
index d3f11b0f..49528c7c 100644
--- a/src/__tests__/Date/__snapshots__/CalendarEdit.test.tsx.snap
+++ b/src/__tests__/Date/__snapshots__/CalendarEdit.test.tsx.snap
@@ -265,7 +265,7 @@ exports[`renders CalendarEdit 1`] = `
             }
             testID="text-input-flat"
             underlineColorAndroid="transparent"
-            value="06/09/2025"
+            value="06/29/2025"
             withModal={false}
           />
         </View>
diff --git a/src/__tests__/Date/__snapshots__/DatePickerInput.test.tsx.snap b/src/__tests__/Date/__snapshots__/DatePickerInput.test.tsx.snap
index a509aba6..957eb557 100644
--- a/src/__tests__/Date/__snapshots__/DatePickerInput.test.tsx.snap
+++ b/src/__tests__/Date/__snapshots__/DatePickerInput.test.tsx.snap
@@ -258,7 +258,7 @@ exports[`renders DatePickerInput 1`] = `
             }
             testID="text-input-flat"
             underlineColorAndroid="transparent"
-            value="06/09/2025"
+            value="06/29/2025"
           />
         </View>
         <View
diff --git a/src/__tests__/Date/__snapshots__/DatePickerInputWithoutModal.test.tsx.snap b/src/__tests__/Date/__snapshots__/DatePickerInputWithoutModal.test.tsx.snap
index 281e6c2c..221cfb38 100644
--- a/src/__tests__/Date/__snapshots__/DatePickerInputWithoutModal.test.tsx.snap
+++ b/src/__tests__/Date/__snapshots__/DatePickerInputWithoutModal.test.tsx.snap
@@ -256,7 +256,7 @@ exports[`renders DatePickerInputWithoutModal 1`] = `
           }
           testID="text-input-flat"
           underlineColorAndroid="transparent"
-          value="06/09/2025"
+          value="06/29/2025"
         />
       </View>
     </View>