diff --git a/packages/react-aria-components/test/Calendar.test.js b/packages/react-aria-components/test/Calendar.test.js
index da3d4880591..c77a286f954 100644
--- a/packages/react-aria-components/test/Calendar.test.js
+++ b/packages/react-aria-components/test/Calendar.test.js
@@ -924,7 +924,7 @@ describe('Calendar', () => {
                   value={value}
                   onChange={e => onChange(e.target.value)}>
                   {items.map(item => (
-                    <option key={item.id} value={item.id}>
+                    <option key={item.id} value={item.id} data-date={item.date.toString()}>
                       {item.formatted}
                     </option>
                   ))}
@@ -968,6 +968,22 @@ describe('Calendar', () => {
         .map(o => o.textContent)
     ).toEqual(Array.from({length: 7}, (_, i) => String(i + 2020)));
 
+    tree.rerender(
+      <YearPickerExample
+        key="cross-year-range"
+        calendarProps={{
+          minValue: new CalendarDate(2024, 8, 3),
+          maxValue: new CalendarDate(2025, 2, 3),
+          focusedValue: new CalendarDate(2025, 2, 1)
+        }}
+      />
+    );
+    let yearPicker = tree.getByLabelText('year');
+    let options = within(yearPicker).getAllByRole('option');
+    expect(options.map(o => o.textContent)).toEqual(['2024', '2025']);
+    expect(yearPicker).toHaveValue('1');
+    expect(options[1]).toHaveAttribute('data-date', '2025-02-03');
+
     tree.rerender(
       <YearPickerExample
         calendarProps={{defaultFocusedValue: new CalendarDate(2026, 6, 30)}}
diff --git a/packages/react-aria/src/calendar/useCalendarYearPicker.ts b/packages/react-aria/src/calendar/useCalendarYearPicker.ts
index 3135f12ef92..fbd7905ff2c 100644
--- a/packages/react-aria/src/calendar/useCalendarYearPicker.ts
+++ b/packages/react-aria/src/calendar/useCalendarYearPicker.ts
@@ -85,8 +85,9 @@ export function useCalendarYearPicker(
   let years: CalendarYearPickerItem[] = [];
   let date = minDate;
   let value = 0;
-  while (date.compare(maxDate) <= 0) {
-    if (isSameYear(date, state.focusedDate)) {
+  while (date.compare(maxDate) <= 0 || isSameYear(date, maxDate)) {
+    let itemDate = date.compare(maxDate) > 0 ? maxDate : date;
+    if (isSameYear(itemDate, state.focusedDate)) {
       value = years.length;
     }
 
@@ -96,8 +97,8 @@ export function useCalendarYearPicker(
       // store the year number, because in some calendars, such
       // as the Japanese, the era may also change.
       id: years.length,
-      date,
-      formatted: formatter.format(date.toDate(state.timeZone))
+      date: itemDate,
+      formatted: formatter.format(itemDate.toDate(state.timeZone))
     });
 
     date = date.add({years: 1});