diff --git a/src/PickerPanel/YearPanel/index.tsx b/src/PickerPanel/YearPanel/index.tsx
index be585dc91..fad63562a 100644
--- a/src/PickerPanel/YearPanel/index.tsx
+++ b/src/PickerPanel/YearPanel/index.tsx
@@ -66,13 +66,9 @@ export default function YearPanel<DateType extends object = any>(
         const startDate = generateConfig.setDate(startMonth, 1);
 
         // End
-        const endMonth = generateConfig.setMonth(
-          currentDate,
-          generateConfig.getMonth(currentDate) + 1,
-        );
-        const enDate = generateConfig.addDate(endMonth, -1);
-
-        return disabledDate(startDate, disabledInfo) && disabledDate(enDate, disabledInfo);
+        const endMonth = generateConfig.addYear(startDate, 1);
+        const endDate = generateConfig.addDate(endMonth, -1);
+        return disabledDate(startDate, disabledInfo) && disabledDate(endDate, disabledInfo);
       }
     : null;
 
diff --git a/tests/panel.spec.tsx b/tests/panel.spec.tsx
index b9af5afd0..39131afab 100644
--- a/tests/panel.spec.tsx
+++ b/tests/panel.spec.tsx
@@ -715,4 +715,15 @@ describe('Picker.Panel', () => {
     expect(container.querySelector('.rc-picker-header-view').textContent).toEqual('01:02:03 AM');
   });
 
+  it('year panel disabled check', () => {
+    const { container } = render(
+      <DayPickerPanel
+        picker="year"
+        disabledDate={(date) => date.isBefore(getDay('1990-12-25'))}
+        defaultValue={getDay('1990-01-01')}
+      />,
+    );
+
+    expect(container.querySelector('.rc-picker-cell-selected').textContent).toEqual('1990');
+  });
 });