diff --git a/CodenameOne/src/com/codename1/ui/spinner/Picker.java b/CodenameOne/src/com/codename1/ui/spinner/Picker.java
index a7d2c7fe86..4cc5fbe53a 100644
--- a/CodenameOne/src/com/codename1/ui/spinner/Picker.java
+++ b/CodenameOne/src/com/codename1/ui/spinner/Picker.java
@@ -505,6 +505,16 @@ private DateSpinner3D createDatePicker3D() {
                     if (defaultValue.getTime() > endDate.getTime()) {
                         defaultValue = startDate;
                     }
+                } else if (startDate != null) {
+                    out.setDateRange(startDate, null);
+                    if (defaultValue.getTime() < startDate.getTime()) {
+                        defaultValue = startDate;
+                    }
+                } else if (endDate != null) {
+                    out.setDateRange(null, endDate);
+                    if (defaultValue.getTime() > endDate.getTime()) {
+                        defaultValue = endDate;
+                    }
                 }
                 if (value != null) {
                     out.setValue(value);