diff --git a/src/Qt5/imports/FluentUI/Controls/FluCalendarPicker.qml b/src/Qt5/imports/FluentUI/Controls/FluCalendarPicker.qml
index c386c9bd..8ca2a083 100644
--- a/src/Qt5/imports/FluentUI/Controls/FluCalendarPicker.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluCalendarPicker.qml
@@ -114,9 +114,11 @@ Rectangle {
             }
         }
         function showPopup() {
-            container.currentDate = current
-            container.date = current
-            container.updateMouth(current)
+            if(current){
+                container.currentDate = current
+                container.date = current
+                container.updateMouth(current)
+            }
             var pos = control.mapToItem(null, 0, 0)
             if(d.window.height>pos.y+control.height+container.height){
                 popup.y = control.height
diff --git a/src/Qt6/imports/FluentUI/Controls/FluCalendarPicker.qml b/src/Qt6/imports/FluentUI/Controls/FluCalendarPicker.qml
index 00c7c173..9e00174c 100644
--- a/src/Qt6/imports/FluentUI/Controls/FluCalendarPicker.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluCalendarPicker.qml
@@ -114,9 +114,11 @@ Rectangle {
             }
         }
         function showPopup() {
-            container.currentDate = current
-            container.date = current
-            container.updateMouth(current)
+            if(current){
+                container.currentDate = current
+                container.date = current
+                container.updateMouth(current)
+            }
             var pos = control.mapToItem(null, 0, 0)
             if(d.window.height>pos.y+control.height+container.height){
                 popup.y = control.height