2 files changed, 6 insertions, 4 deletions

diff --git a/src/module/Combobox.jsx b/src/module/Combobox.jsx
index 7374b39..f1e7c5b 100644
--- a/src/module/Combobox.jsx
+++ b/src/module/Combobox.jsx
@@ -79,7 +79,8 @@ const Combobox = React.createClass({
   },
 
   getMinuteSelect(minute) {
-    const { prefixCls, minuteOptions, disabledMinutes, value } = this.props;
+    const { prefixCls, minuteOptions, disabledMinutes } = this.props;
+    const value = this.props.value || this.getNow();
     const disabledOptions = disabledMinutes(value.getHourOfDay());
 
     return (
@@ -95,10 +96,11 @@ const Combobox = React.createClass({
   },
 
   getSecondSelect(second) {
-    const { prefixCls, secondOptions, disabledSeconds, showSecond, value } = this.props;
+    const { prefixCls, secondOptions, disabledSeconds, showSecond } = this.props;
     if (!showSecond) {
       return null;
     }
+    const value = this.props.value || this.getNow();
     const disabledOptions = disabledSeconds(value.getHourOfDay(), value.getMinutes());
 
     return (
diff --git a/src/module/Panel.jsx b/src/module/Panel.jsx
index 94d3842..4c3d071 100644
--- a/src/module/Panel.jsx
+++ b/src/module/Panel.jsx
@@ -78,8 +78,8 @@ const Panel = React.createClass({
     const { locale, prefixCls, placeholder, disabledHours, disabledMinutes, disabledSeconds, hideDisabledOptions, allowEmpty, showHour, showSecond, formatter, gregorianCalendarLocale } = this.props;
     const value = this.state.value;
     const disabledHourOptions = disabledHours();
-    const disabledMinuteOptions = disabledMinutes(value.getHourOfDay());
-    const disabledSecondOptions = disabledSeconds(value.getHourOfDay(), value.getMinutes());
+    const disabledMinuteOptions = disabledMinutes(value ? value.getHourOfDay() : null);
+    const disabledSecondOptions = disabledSeconds(value ? value.getHourOfDay() : null, value ? value.getMinutes() : null);
     const hourOptions = generateOptions(24, disabledHourOptions, hideDisabledOptions);
     const minuteOptions = generateOptions(60, disabledMinuteOptions, hideDisabledOptions);
     const secondOptions = generateOptions(60, disabledSecondOptions, hideDisabledOptions);