diff --git a/spiffworkflow-frontend/src/rjsf/carbon_theme/BaseInputTemplate/BaseInputTemplate.tsx b/spiffworkflow-frontend/src/rjsf/carbon_theme/BaseInputTemplate/BaseInputTemplate.tsx
index e60d1230c..28971f2c7 100644
--- a/spiffworkflow-frontend/src/rjsf/carbon_theme/BaseInputTemplate/BaseInputTemplate.tsx
+++ b/spiffworkflow-frontend/src/rjsf/carbon_theme/BaseInputTemplate/BaseInputTemplate.tsx
@@ -125,6 +125,7 @@ export default function BaseInputTemplate<
           placeholder={DATE_FORMAT_FOR_DISPLAY}
           helperText={commonAttributes.helperText}
           type="text"
+          labelText=""
           size="md"
           value={dateValue}
           autocomplete="off"
diff --git a/spiffworkflow-frontend/src/services/DateAndTimeService.tsx b/spiffworkflow-frontend/src/services/DateAndTimeService.tsx
index e9f1153a5..805f3486d 100644
--- a/spiffworkflow-frontend/src/services/DateAndTimeService.tsx
+++ b/spiffworkflow-frontend/src/services/DateAndTimeService.tsx
@@ -41,6 +41,9 @@ const convertDateObjectToFormattedString = (dateObject: Date) => {
 };
 
 const dateStringToYMDFormat = (dateString: string) => {
+  if (dateString === undefined || dateString === null) {
+    return dateString;
+  }
   if (dateString && dateString.match(/^\d{4}-\d{2}-\d{2}$/)) {
     return dateString;
   }