diff --git a/packages/pf4-component-mapper/src/date-picker/date-picker.js b/packages/pf4-component-mapper/src/date-picker/date-picker.js
index 594618b1b..fdfe0d131 100644
--- a/packages/pf4-component-mapper/src/date-picker/date-picker.js
+++ b/packages/pf4-component-mapper/src/date-picker/date-picker.js
@@ -19,7 +19,13 @@ const DatePicker = (props) => {
       id={id || input.name}
       FormGroupProps={FormGroupProps}
     >
-      <PF4DatePicker {...input} {...rest} id={id || input.name} isDisabled={isDisabled || isReadOnly} />
+      <PF4DatePicker
+        {...input}
+        onChange={(_e, value) => input.onChange(value)}
+        {...rest}
+        id={id || input.name}
+        isDisabled={isDisabled || isReadOnly}
+      />
     </FormGroup>
   );
 };
diff --git a/packages/pf4-component-mapper/src/time-picker/time-picker.js b/packages/pf4-component-mapper/src/time-picker/time-picker.js
index 93e72c746..7d8625021 100644
--- a/packages/pf4-component-mapper/src/time-picker/time-picker.js
+++ b/packages/pf4-component-mapper/src/time-picker/time-picker.js
@@ -19,7 +19,14 @@ const TimePicker = (props) => {
       id={id || input.name}
       FormGroupProps={FormGroupProps}
     >
-      <PF4TimePicker {...input} time={input.value ? input.value : undefined} {...rest} id={id || input.name} isDisabled={isDisabled || isReadOnly} />
+      <PF4TimePicker
+        {...input}
+        onChange={(_e, value) => input.onChange(value)}
+        time={input.value ? input.value : undefined}
+        {...rest}
+        id={id || input.name}
+        isDisabled={isDisabled || isReadOnly}
+      />
     </FormGroup>
   );
 };