diff --git a/components/date_picker/DatePicker.js b/components/date_picker/DatePicker.js
index 799e52ea..72104585 100644
--- a/components/date_picker/DatePicker.js
+++ b/components/date_picker/DatePicker.js
@@ -45,7 +45,7 @@ class DatePicker extends React.Component {
     const { inputClassName, value } = this.props;
     const inputFormat = this.props.inputFormat || time.formatDate;
     const date = Object.prototype.toString.call(value) === '[object Date]' ? value : undefined;
-    const formattedDate = date === undefined ? inputFormat(value) : '';
+    const formattedDate = date === undefined ? '' : inputFormat(value);
 
     return (
       <div data-react-toolbox='date-picker'>