diff --git a/src/components/Form/FormProvider.js b/src/components/Form/FormProvider.js
index af2511fc9f74..63953d8303db 100644
--- a/src/components/Form/FormProvider.js
+++ b/src/components/Form/FormProvider.js
@@ -112,7 +112,7 @@ function getInitialValueByType(valueType) {
 function FormProvider({validate, formID, shouldValidateOnBlur, shouldValidateOnChange, children, formState, network, enabledWhenOffline, draftValues, onSubmit, ...rest}) {
     const inputRefs = useRef({});
     const touchedInputs = useRef({});
-    const [inputValues, setInputValues] = useState({});
+    const [inputValues, setInputValues] = useState(() => ({...draftValues}));
     const [errors, setErrors] = useState({});
     const hasServerError = useMemo(() => Boolean(formState) && !_.isEmpty(formState.errors), [formState]);