diff --git a/src/datepicker.jsx b/src/datepicker.jsx
index 19d8234042..a72adce0b6 100644
--- a/src/datepicker.jsx
+++ b/src/datepicker.jsx
@@ -366,6 +366,9 @@ export default class DatePicker extends React.Component {
 
   onClearClick = (event) => {
     event.preventDefault()
+    if (this.state.inputValue) {
+      this.setState({ inputValue: null })
+    }
     this.props.onChange(null, event)
   }