diff --git a/src/modules/account/settings/publicProfile/EditPublicProfile.tsx b/src/modules/account/settings/publicProfile/EditPublicProfile.tsx
index 99284157c..c7b3b6bc1 100644
--- a/src/modules/account/settings/publicProfile/EditPublicProfile.tsx
+++ b/src/modules/account/settings/publicProfile/EditPublicProfile.tsx
@@ -57,6 +57,7 @@ export function EditPublicProfile({
   const {
     register,
     handleSubmit,
+    watch,
     formState: { errors, isValid },
   } = useForm<Inputs>({
     mode: 'onChange',
@@ -92,6 +93,7 @@ export function EditPublicProfile({
 
   // register visibility checkbox manually
   const visibility = register('visibility');
+  const visibilityValue = watch('visibility');
 
   return (
     <BorderedSection title={t('TITLE')}>
@@ -160,10 +162,12 @@ export function EditPublicProfile({
           control={
             <Checkbox
               color="primary"
+              checked={visibilityValue}
               name={visibility.name}
               onChange={visibility.onChange}
             />
           }
+          ref={visibility.ref}
           label={t('VISIBILITY_LABEL')}
         />
         <Stack direction="row" gap={1} justifyContent="flex-end">
diff --git a/src/modules/account/settings/publicProfile/PublicProfile.tsx b/src/modules/account/settings/publicProfile/PublicProfile.tsx
index 9688c4122..1caa8acd4 100644
--- a/src/modules/account/settings/publicProfile/PublicProfile.tsx
+++ b/src/modules/account/settings/publicProfile/PublicProfile.tsx
@@ -102,6 +102,7 @@ export function PublicProfile(): JSX.Element {
       </BorderedSection>
     );
   }
+
   return (
     <BorderedSection
       id={PUBLIC_PROFILE_NOT_CONFIGURED_CONTAINER_ID}