diff --git a/components/jujiboutils/src/jlabeleddateedit.pas b/components/jujiboutils/src/jlabeleddateedit.pas
index d1fe47e3b..ec9c3a620 100644
--- a/components/jujiboutils/src/jlabeleddateedit.pas
+++ b/components/jujiboutils/src/jlabeleddateedit.pas
@@ -150,7 +150,9 @@ end;
 procedure TJLabeledDateEdit.formatInput;
 begin
   if theValue <> 0 then
-    Text := FormatDateTime(DisplayFormat, theValue);
+    Text := FormatDateTime(DisplayFormat, theValue)
+  else
+    Text := '';
 end;
 
 procedure TJLabeledDateEdit.SetButtonWidth(AValue: Integer);
diff --git a/components/jujiboutils/src/jlabeleddatetimeedit.pas b/components/jujiboutils/src/jlabeleddatetimeedit.pas
index 0471364cf..bcbfa39a2 100644
--- a/components/jujiboutils/src/jlabeleddatetimeedit.pas
+++ b/components/jujiboutils/src/jlabeleddatetimeedit.pas
@@ -155,7 +155,9 @@ end;
 procedure TJLabeledDateTimeEdit.formatInput;
 begin
   if theValue <> 0 then
-    Text := FormatDateTime(DisplayFormat, theValue);
+    Text := FormatDateTime(DisplayFormat, theValue)
+  else
+    Text := '';
 end;
 
 procedure TJLabeledDateTimeEdit.SetButtonWidth(AValue: integer);