diff --git a/src/Picker.jsx b/src/Picker.jsx
index bce6db698..f7f93590e 100644
--- a/src/Picker.jsx
+++ b/src/Picker.jsx
@@ -150,7 +150,7 @@ class Picker extends React.Component {
     const extraProps = {
       ref: this.saveCalendarRef,
       defaultValue: defaultValue || calendarProps.defaultValue,
-      selectedValue: value,
+      selectedValue: value || calendarProps.selectedValue,
       onKeyDown: this.onCalendarKeyDown,
       onOk: createChainedFunction(calendarProps.onOk, this.onCalendarOk),
       onSelect: createChainedFunction(calendarProps.onSelect, this.onCalendarSelect),