diff --git a/packages/ui/src/components/Form/customField/PasswordField.tsx b/packages/ui/src/components/Form/customField/PasswordField.tsx
index f86a2a5f9..3930b98f7 100644
--- a/packages/ui/src/components/Form/customField/PasswordField.tsx
+++ b/packages/ui/src/components/Form/customField/PasswordField.tsx
@@ -47,7 +47,7 @@ const PasswordFieldComponent = ({ onChange, ...props }: PasswordFieldProps) => {
           placeholder={props.placeholder}
           ref={props.inputRef}
           type={passwordHidden ? 'password' : 'text'}
-          value={props.value}
+          value={props.value ?? ''}
           {...filterDOMProps(props)}
         />
         <FormHelperText>