diff --git a/src/shared/ui/calendar/nice-calendar-month.tsx b/src/shared/ui/calendar/nice-calendar-month.tsx
index 460a5b8..5327e90 100644
--- a/src/shared/ui/calendar/nice-calendar-month.tsx
+++ b/src/shared/ui/calendar/nice-calendar-month.tsx
@@ -44,13 +44,21 @@ const NiceCalendarMonth = ({
     if(calendarType === CalendarType.Start){
       setMinMonth(undefined);
       if(!!endMonth){
-        setMaxMonth(moment(endMonth + '.01', 'YYYY.MM.DD').toDate());
+        // Parse endMonth with moment, handling both YYYY.MM and YYYYMM formats
+        const endDate = moment(endMonth, ['YYYY.MM', 'YYYYMM'], true);
+        if (endDate.isValid()) {
+          setMaxMonth(endDate.toDate());
+        }
       }
       setValueYear(startMonth?.substring(0, 4));
     }
     else if(calendarType === CalendarType.End){
       if(!!startMonth){
-        setMinMonth(moment(startMonth + '.01', 'YYYY.MM.DD').toDate());
+        // Parse startMonth with moment, handling both YYYY.MM and YYYYMM formats
+        const startDate = moment(startMonth, ['YYYY.MM', 'YYYYMM'], true);
+        if (startDate.isValid()) {
+          setMinMonth(startDate.toDate());
+        }
       }
       setMaxMonth(new Date());
       setValueYear(endMonth?.substring(0, 4));