diff --git a/packages/web/package.json b/packages/web/package.json
index b709685e..f5a45ef6 100644
--- a/packages/web/package.json
+++ b/packages/web/package.json
@@ -30,7 +30,7 @@
     "notistack": "^2.0.2",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
-    "react-hook-form": "^7.17.2",
+    "react-hook-form": "^7.43.9",
     "react-intl": "^5.20.12",
     "react-json-tree": "^0.16.2",
     "react-router-dom": "^6.0.2",
diff --git a/packages/web/src/components/ControlledAutocomplete/index.tsx b/packages/web/src/components/ControlledAutocomplete/index.tsx
index 76d86671..b303e286 100644
--- a/packages/web/src/components/ControlledAutocomplete/index.tsx
+++ b/packages/web/src/components/ControlledAutocomplete/index.tsx
@@ -27,7 +27,7 @@ function ControlledAutocomplete(
     required = false,
     name,
     defaultValue,
-    shouldUnregister = true,
+    shouldUnregister = false,
     onBlur,
     onChange,
     description,
diff --git a/packages/web/src/components/PowerInput/index.tsx b/packages/web/src/components/PowerInput/index.tsx
index 4c2b3fbf..150f850a 100644
--- a/packages/web/src/components/PowerInput/index.tsx
+++ b/packages/web/src/components/PowerInput/index.tsx
@@ -83,7 +83,7 @@ const PowerInput = (props: PowerInputProps) => {
       name={name}
       control={control}
       defaultValue={defaultValue}
-      shouldUnregister={shouldUnregister ?? true}
+      shouldUnregister={shouldUnregister ?? false}
       render={({
         field: {
           value,
diff --git a/packages/web/src/components/ResetPasswordForm/index.ee.tsx b/packages/web/src/components/ResetPasswordForm/index.ee.tsx
index 3ec40073..9afbd914 100644
--- a/packages/web/src/components/ResetPasswordForm/index.ee.tsx
+++ b/packages/web/src/components/ResetPasswordForm/index.ee.tsx
@@ -77,7 +77,7 @@ export default function ResetPasswordForm() {
               error={touchedFields.password && !!errors?.password}
               helperText={
                 touchedFields.password && errors?.password?.message
-                  ? formatMessage(errors?.password?.message, {
+                  ? formatMessage(errors?.password?.message as string, {
                       inputName: formatMessage('resetPasswordForm.passwordFieldLabel'),
                     })
                   : ''
@@ -94,7 +94,7 @@ export default function ResetPasswordForm() {
               helperText={
                 touchedFields.confirmPassword &&
                 errors?.confirmPassword?.message
-                  ? formatMessage(errors?.confirmPassword?.message, {
+                  ? formatMessage(errors?.confirmPassword?.message as string, {
                       inputName: formatMessage(
                         'resetPasswordForm.confirmPasswordFieldLabel'
                       ),
diff --git a/packages/web/src/components/SignUpForm/index.ee.tsx b/packages/web/src/components/SignUpForm/index.ee.tsx
index a9ef86ee..ac8c6aca 100644
--- a/packages/web/src/components/SignUpForm/index.ee.tsx
+++ b/packages/web/src/components/SignUpForm/index.ee.tsx
@@ -101,7 +101,7 @@ function SignUpForm() {
               error={touchedFields.fullName && !!errors?.fullName}
               helperText={
                 touchedFields.fullName && errors?.fullName?.message
-                  ? formatMessage(errors?.fullName?.message, {
+                  ? formatMessage(errors?.fullName?.message as string, {
                       inputName: formatMessage('signupForm.fullNameFieldLabel'),
                     })
                   : ''
@@ -118,7 +118,7 @@ function SignUpForm() {
               error={touchedFields.email && !!errors?.email}
               helperText={
                 touchedFields.email && errors?.email?.message
-                  ? formatMessage(errors?.email?.message, {
+                  ? formatMessage(errors?.email?.message as string, {
                       inputName: formatMessage('signupForm.emailFieldLabel'),
                     })
                   : ''
@@ -134,7 +134,7 @@ function SignUpForm() {
               error={touchedFields.password && !!errors?.password}
               helperText={
                 touchedFields.password && errors?.password?.message
-                  ? formatMessage(errors?.password?.message, {
+                  ? formatMessage(errors?.password?.message as string, {
                       inputName: formatMessage('signupForm.passwordFieldLabel'),
                     })
                   : ''
@@ -151,7 +151,7 @@ function SignUpForm() {
               helperText={
                 touchedFields.confirmPassword &&
                 errors?.confirmPassword?.message
-                  ? formatMessage(errors?.confirmPassword?.message, {
+                  ? formatMessage(errors?.confirmPassword?.message as string, {
                       inputName: formatMessage(
                         'signupForm.confirmPasswordFieldLabel'
                       ),
diff --git a/packages/web/src/components/TextField/index.tsx b/packages/web/src/components/TextField/index.tsx
index 9686740b..bec00d9b 100644
--- a/packages/web/src/components/TextField/index.tsx
+++ b/packages/web/src/components/TextField/index.tsx
@@ -38,7 +38,7 @@ export default function TextField(props: TextFieldProps): React.ReactElement {
     required,
     name,
     defaultValue,
-    shouldUnregister = true,
+    shouldUnregister = false,
     clickToCopy = false,
     readOnly = false,
     disabled = false,
diff --git a/yarn.lock b/yarn.lock
index 7f9f203d..46289b35 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -14634,10 +14634,10 @@ react-error-overlay@^6.0.10:
   resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.10.tgz#0fe26db4fa85d9dbb8624729580e90e7159a59a6"
   integrity sha512-mKR90fX7Pm5seCOfz8q9F+66VCc1PGsWSBxKbITjfKVQHMNF2zudxHnMdJiB1fRCb+XsbQV9sO9DCkgsMQgBIA==
 
-react-hook-form@^7.17.2:
-  version "7.24.1"
-  resolved "https://registry.yarnpkg.com/react-hook-form/-/react-hook-form-7.24.1.tgz#00e80ca20fe3bb3b86d236d74ed1a4e5f6525228"
-  integrity sha512-UndVzKetChAsO+qkRo/6vOgaeTP60x324mHQ4iXVgHDvFjd+X/caWW0/QuAqipt8Bs7pyKH8147UQCrPTYFc2g==
+react-hook-form@^7.43.9:
+  version "7.43.9"
+  resolved "https://registry.yarnpkg.com/react-hook-form/-/react-hook-form-7.43.9.tgz#84b56ac2f38f8e946c6032ccb760e13a1037c66d"
+  integrity sha512-AUDN3Pz2NSeoxQ7Hs6OhQhDr6gtF9YRuutGDwPQqhSUAHJSgGl2VeY3qN19MG0SucpjgDiuMJ4iC5T5uB+eaNQ==
 
 react-intl@^5.20.12:
   version "5.24.3"