diff --git a/domino-ui/src/main/java/org/dominokit/domino/ui/forms/DateBox.java b/domino-ui/src/main/java/org/dominokit/domino/ui/forms/DateBox.java
index b33c07504..1bd6b10e6 100644
--- a/domino-ui/src/main/java/org/dominokit/domino/ui/forms/DateBox.java
+++ b/domino-ui/src/main/java/org/dominokit/domino/ui/forms/DateBox.java
@@ -501,7 +501,9 @@ protected void doSetValue(Date value) {
     withDateSelectionToggleListeners(
         false,
         field -> {
-          this.calendar.setDate(this.value);
+          if (nonNull(this.value)) {
+            this.calendar.setDate(this.value);
+          }
         });
   }