diff --git a/src/date-picker/date-picker.jsx b/src/date-picker/date-picker.jsx
index e687e320b11798..6efd2c8f093cdf 100644
--- a/src/date-picker/date-picker.jsx
+++ b/src/date-picker/date-picker.jsx
@@ -58,11 +58,13 @@ let DatePicker = React.createClass({
   },
 
   /**
-   * Rather than checking all the possible dates for changes ourselves,
-   * just assign the current props date and let setState do the checking.
+   * If this is a controlled input, rather than checking all the possible dates for changes
+   * ourselves, just assign the current props date and let setState do the checking.
    */
   componentWillReceiveProps(nextProps) {
-    this.setDate(this._getPropsDate(nextProps));
+    if (nextProps.hasOwnProperty('value') || nextProps.hasOwnProperty('valueLink')) {
+      this.setDate(this._getPropsDate(nextProps));
+    }
   },
 
   render() {