diff --git a/src/components/formio/textfield.tsx b/src/components/formio/textfield.tsx
index 082a210..287d1ba 100644
--- a/src/components/formio/textfield.tsx
+++ b/src/components/formio/textfield.tsx
@@ -35,7 +35,7 @@ export const TextField: React.FC<JSX.IntrinsicElements['input'] & TextFieldProps
   childrenAfterField,
   ...props
 }) => {
-  const {getFieldProps, getFieldMeta} = useFormikContext();
+  const {getFieldProps, getFieldMeta, setFieldValue} = useFormikContext();
   const {value, onChange: formikOnChange} = getFieldProps<string | undefined>(name);
   const {touched} = getFieldMeta<string | undefined>(name);
   const {errors, hasErrors} = useValidationErrors(name);
@@ -48,6 +48,11 @@ export const TextField: React.FC<JSX.IntrinsicElements['input'] & TextFieldProps
     props = {...props, value: ''};
   }
 
+  if (value === undefined || value === null) {
+    // Make sure value is valid
+    setFieldValue(name, '');
+  }
+
   // XXX: this is only accepted in the form builder to get to (close to) vanilla form
   // builder feature parity - setting the value with mask placeholders is bad for
   // accessibility.