diff --git a/src/shared/ui/calendar/nice-calendar.tsx b/src/shared/ui/calendar/nice-calendar.tsx
index 5b024e2..a6c1d66 100644
--- a/src/shared/ui/calendar/nice-calendar.tsx
+++ b/src/shared/ui/calendar/nice-calendar.tsx
@@ -29,7 +29,7 @@ const NiceCalendar = ({
   minDate: propMinDate,
   maxDate: propMaxDate
 }: NiceCalendarProps) => {
-  const [valueDate, setValueDate] = useState<string>();
+  const [valueDate, setValueDate] = useState<Date | undefined>();
   const [minDate, setMinDate] = useState<Date | undefined>();
   const [maxDate, setMaxDate] = useState<Date | undefined>();
   const onchangeToDate = (selectedDate: any) => {
@@ -44,21 +44,21 @@ const NiceCalendar = ({
     if(calendarType === CalendarType.Start){
       setMinDate(propMinDate || undefined);
       if(!!endDate){
-        setMaxDate(new Date(endDate));
+        setMaxDate(moment(endDate, 'YYYY.MM.DD').toDate());
       }
-      setValueDate(startDate);
+      setValueDate(startDate ? moment(startDate, 'YYYY.MM.DD').toDate() : undefined);
     }
     else if(calendarType === CalendarType.End){
       if(!!startDate){
-        setMinDate(new Date(startDate));
+        setMinDate(moment(startDate, 'YYYY.MM.DD').toDate());
       }
       setMaxDate(propMaxDate || new Date());
-      setValueDate(endDate);
+      setValueDate(endDate ? moment(endDate, 'YYYY.MM.DD').toDate() : undefined);
     }
     else if(calendarType === CalendarType.Single){
       setMinDate(propMinDate || undefined);
       setMaxDate(propMaxDate || undefined);
-      setValueDate(singleDate);
+      setValueDate(singleDate ? moment(singleDate, 'YYYY.MM.DD').toDate() : undefined);
     }
   };
   
diff --git a/src/shared/ui/filter/calendar.tsx b/src/shared/ui/filter/calendar.tsx
index df9062d..164f5f0 100644
--- a/src/shared/ui/filter/calendar.tsx
+++ b/src/shared/ui/filter/calendar.tsx
@@ -74,12 +74,12 @@ export const FilterCalendar = ({
 
   const setNewDate = (date: string) => {
     if(calendarType === CalendarType.Start){
-      setStartDate(moment(date).format('YYYYMMDD'));
-      setNewStartDate(moment(date).format('YYYY.MM.DD'));
+      setStartDate(moment(date, 'YYYY.MM.DD').format('YYYYMMDD'));
+      setNewStartDate(moment(date, 'YYYY.MM.DD').format('YYYY.MM.DD'));
     }
     else if(calendarType === CalendarType.End){
-      setEndDate(moment(date).format('YYYYMMDD'));
-      setNewEndDate(moment(date).format('YYYY.MM.DD'));
+      setEndDate(moment(date, 'YYYY.MM.DD').format('YYYYMMDD'));
+      setNewEndDate(moment(date, 'YYYY.MM.DD').format('YYYY.MM.DD'));
     }
     setCalendarOpen(false);
   }