diff --git a/src/Calendar.js b/src/Calendar.js
index 833d51381..fe8a4d218 100644
--- a/src/Calendar.js
+++ b/src/Calendar.js
@@ -842,12 +842,13 @@ class Calendar extends React.Component {
   handleNavigate = (action, newDate) => {
     let { view, date, getNow, onNavigate, ...props } = this.props
     let ViewComponent = this.getView()
+    let today = getNow()
 
     date = moveDate(ViewComponent, {
       ...props,
       action,
-      date: newDate || date,
-      today: getNow(),
+      date: newDate || date || today,
+      today,
     })
 
     onNavigate(date, view, action)