diff --git a/client/src/components/Settings/Encryption/Form.tsx b/client/src/components/Settings/Encryption/Form.tsx
index be03433d..a222a8e9 100644
--- a/client/src/components/Settings/Encryption/Form.tsx
+++ b/client/src/components/Settings/Encryption/Form.tsx
@@ -152,8 +152,8 @@ export const Form = ({
         formState: { isSubmitting, isValid },
     } = useForm<EncryptionFormValues>({
         defaultValues: {
-            ...initialValues,
             ...defaultValues,
+            ...initialValues,
         },
         mode: 'onBlur',
     });