diff --git a/src/components/calendar/Calendar.js b/src/components/calendar/Calendar.js
index 2fec414aca..2caefe81b6 100644
--- a/src/components/calendar/Calendar.js
+++ b/src/components/calendar/Calendar.js
@@ -591,6 +591,7 @@ export class Calendar extends Component {
 
     onClearButtonClick(event) {
         this.updateModel(event, null);
+        this.updateInputfield(null);
 
         if (this.props.onClearButtonClick) {
             this.props.onClearButtonClick(event);