diff --git a/core/app/[locale]/(default)/account/[tab]/_components/addresses-content/add-address.tsx b/core/app/[locale]/(default)/account/[tab]/_components/addresses-content/add-address.tsx
index 394a135b8..513c8c4d7 100644
--- a/core/app/[locale]/(default)/account/[tab]/_components/addresses-content/add-address.tsx
+++ b/core/app/[locale]/(default)/account/[tab]/_components/addresses-content/add-address.tsx
@@ -2,7 +2,7 @@
 
 import { useRouter } from 'next/navigation';
 import { useTranslations } from 'next-intl';
-import { useRef, useState } from 'react';
+import { useEffect, useRef, useState } from 'react';
 import { useFormStatus } from 'react-dom';
 import ReCaptcha from 'react-google-recaptcha';
 
@@ -97,6 +97,10 @@ export const AddAddress = ({
 
   const { setAccountState } = useAccountStatusContext();
 
+  useEffect(() => {
+    setAccountState({ status: 'idle' });
+  }, [setAccountState]);
+
   const handleTextInputValidation = createTextInputValidationHandler(
     setTextInputValid,
     textInputValid,
diff --git a/core/app/[locale]/(default)/account/[tab]/_components/addresses-content/edit-address.tsx b/core/app/[locale]/(default)/account/[tab]/_components/addresses-content/edit-address.tsx
index e5437e8b7..38a41627d 100644
--- a/core/app/[locale]/(default)/account/[tab]/_components/addresses-content/edit-address.tsx
+++ b/core/app/[locale]/(default)/account/[tab]/_components/addresses-content/edit-address.tsx
@@ -2,7 +2,7 @@
 
 import { useRouter } from 'next/navigation';
 import { useTranslations } from 'next-intl';
-import { useRef, useState } from 'react';
+import { useEffect, useRef, useState } from 'react';
 import { useFormStatus } from 'react-dom';
 import ReCaptcha from 'react-google-recaptcha';
 
@@ -101,6 +101,10 @@ export const EditAddress = ({
   const [isReCaptchaValid, setReCaptchaValid] = useState(true);
   const { setAccountState } = useAccountStatusContext();
 
+  useEffect(() => {
+    setAccountState({ status: 'idle' });
+  }, [setAccountState]);
+
   const [textInputValid, setTextInputValid] = useState<Record<string, boolean>>({});
 
   const defaultStates = countries
@@ -170,10 +174,6 @@ export const EditAddress = ({
     router.push('/account/addresses');
   };
 
-  const onCancelChange = () => {
-    setAccountState({ status: 'idle' });
-  };
-
   return (
     <>
       {formStatus && (
@@ -273,12 +273,7 @@ export const EditAddress = ({
           <FormSubmit asChild>
             <SubmitButton messages={{ submit: t('submit'), submitting: t('submitting') }} />
           </FormSubmit>
-          <Button
-            asChild
-            className="items-center px-8 md:ms-6 md:w-fit"
-            onClick={onCancelChange}
-            variant="secondary"
-          >
+          <Button asChild className="items-center px-8 md:ms-6 md:w-fit" variant="secondary">
             <Link href="/account/addresses">{t('cancel')}</Link>
           </Button>
           <Modal