diff --git a/src/Calendar.js b/src/Calendar.js
index 96935692..58d06f60 100644
--- a/src/Calendar.js
+++ b/src/Calendar.js
@@ -44,7 +44,7 @@ const Calendar = ({
     };
     calendarElement.current.addEventListener('keyup', handleKeyUp, false);
     return () => {
-      calendarElement.current.removeEventListener('keyup', handleKeyUp, false);
+      calendarElement.current && calendarElement.current.removeEventListener('keyup', handleKeyUp, false);
     };
   });