diff --git a/components/lib/calendar/Calendar.js b/components/lib/calendar/Calendar.js
index 51e9fcdea5..520629b63f 100644
--- a/components/lib/calendar/Calendar.js
+++ b/components/lib/calendar/Calendar.js
@@ -1055,8 +1055,13 @@ export const Calendar = React.memo(
                 setViewDateState(value);
             }
 
-            setCurrentMonth(value.getMonth());
-            setCurrentYear(value.getFullYear());
+            if (value !== null) {
+                setCurrentMonth(value.getMonth());
+                setCurrentYear(value.getFullYear());
+            } else {
+                setCurrentMonth(null);
+                setCurrentYear(null);
+            }
         };
 
         const setNavigationState = (newViewDate) => {