diff --git a/src/pages/settings/Profile/Contacts/ValidateCodeForm/BaseValidateCodeForm.js b/src/pages/settings/Profile/Contacts/ValidateCodeForm/BaseValidateCodeForm.js
index 9f6d2db591b9..973a0475846d 100644
--- a/src/pages/settings/Profile/Contacts/ValidateCodeForm/BaseValidateCodeForm.js
+++ b/src/pages/settings/Profile/Contacts/ValidateCodeForm/BaseValidateCodeForm.js
@@ -88,6 +88,12 @@ function BaseValidateCodeForm(props) {
 
     useEffect(() => {
         Session.clearAccountMessages();
+        if (!validateLoginError) {
+            return;
+        }
+        User.clearContactMethodErrors(props.contactMethod, 'validateLogin');
+        // contactMethod is not added as a dependency since it does not change between renders
+        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
 
     useEffect(() => {