diff --git a/src/pages/signin/SignInPage.js b/src/pages/signin/SignInPage.js
index 308043f252b4..2387c59da0d4 100644
--- a/src/pages/signin/SignInPage.js
+++ b/src/pages/signin/SignInPage.js
@@ -180,7 +180,7 @@ function SignInPage({credentials, account}) {
                     isVisible={shouldShowLoginForm}
                     blurOnSubmit={account.validated === false}
                 />
-                {shouldShowValidateCodeForm ? <ValidateCodeForm isVisible={shouldShowValidateCodeForm} /> : <PasswordForm isVisible={shouldShowPasswordForm} />}
+                {shouldShowValidateCodeForm ? <ValidateCodeForm /> : <PasswordForm isVisible={shouldShowPasswordForm} />}
                 {shouldShowResendValidationForm && <ResendValidationForm />}
                 {shouldShowUnlinkLoginForm && <UnlinkLoginForm />}
                 {shouldShowEmailDeliveryFailurePage && <EmailDeliveryFailurePage />}
diff --git a/src/pages/signin/ValidateCodeForm/BaseValidateCodeForm.js b/src/pages/signin/ValidateCodeForm/BaseValidateCodeForm.js
index d5e0f73d303f..209fc6c5e20d 100755
--- a/src/pages/signin/ValidateCodeForm/BaseValidateCodeForm.js
+++ b/src/pages/signin/ValidateCodeForm/BaseValidateCodeForm.js
@@ -15,7 +15,6 @@ import ChangeExpensifyLoginLink from '../ChangeExpensifyLoginLink';
 import withLocalize, {withLocalizePropTypes} from '../../../components/withLocalize';
 import compose from '../../../libs/compose';
 import * as ValidationUtils from '../../../libs/ValidationUtils';
-import withToggleVisibilityView, {toggleVisibilityViewPropTypes} from '../../../components/withToggleVisibilityView';
 import canFocusInputOnScreenFocus from '../../../libs/canFocusInputOnScreenFocus';
 import * as ErrorUtils from '../../../libs/ErrorUtils';
 import {withNetwork} from '../../../components/OnyxProvider';
@@ -62,7 +61,6 @@ const propTypes = {
     autoComplete: PropTypes.oneOf(['sms-otp', 'one-time-code']).isRequired,
 
     ...withLocalizePropTypes,
-    ...toggleVisibilityViewPropTypes,
 };
 
 const defaultProps = {
@@ -80,7 +78,6 @@ function BaseValidateCodeForm(props) {
     const [twoFactorAuthCode, setTwoFactorAuthCode] = useState('');
     const [timeRemaining, setTimeRemaining] = useState(30);
 
-    const prevIsVisible = usePrevious(props.isVisible);
     const prevRequiresTwoFactorAuth = usePrevious(props.account.requiresTwoFactorAuth);
     const prevValidateCode = usePrevious(props.credentials.validateCode);
 
@@ -98,26 +95,11 @@ function BaseValidateCodeForm(props) {
     }, [props.account.isLoading, props.session.autoAuthState, hasError]);
 
     useEffect(() => {
-        if (!inputValidateCodeRef.current || prevIsVisible || !props.isVisible || !canFocusInputOnScreenFocus()) {
+        if (!inputValidateCodeRef.current || !canFocusInputOnScreenFocus()) {
             return;
         }
         inputValidateCodeRef.current.focus();
-    }, [props.isVisible, prevIsVisible]);
-
-    useEffect(() => {
-        if (!inputValidateCodeRef.current) {
-            return;
-        }
-
-        if (!validateCode) {
-            return;
-        }
-
-        // Clear the code input if magic code valid
-        if (prevIsVisible && !props.isVisible) {
-            setValidateCode('');
-        }
-    }, [props.isVisible, prevIsVisible, validateCode]);
+    }, []);
 
     useEffect(() => {
         if (prevValidateCode || !props.credentials.validateCode) {
@@ -329,6 +311,5 @@ export default compose(
         preferredLocale: {key: ONYXKEYS.NVP_PREFERRED_LOCALE},
         session: {key: ONYXKEYS.SESSION},
     }),
-    withToggleVisibilityView,
     withNetwork(),
 )(BaseValidateCodeForm);
diff --git a/src/pages/signin/ValidateCodeForm/index.android.js b/src/pages/signin/ValidateCodeForm/index.android.js
index e0258121fad0..7ff81357725d 100644
--- a/src/pages/signin/ValidateCodeForm/index.android.js
+++ b/src/pages/signin/ValidateCodeForm/index.android.js
@@ -1,21 +1,11 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import BaseValidateCodeForm from './BaseValidateCodeForm';
 
-const defaultProps = {
-    isVisible: false,
-};
+const defaultProps = {};
 
-const propTypes = {
-    isVisible: PropTypes.bool,
-};
-function ValidateCodeForm(props) {
-    return (
-        <BaseValidateCodeForm
-            isVisible={props.isVisible}
-            autoComplete="sms-otp"
-        />
-    );
+const propTypes = {};
+function ValidateCodeForm() {
+    return <BaseValidateCodeForm autoComplete="sms-otp" />;
 }
 
 ValidateCodeForm.displayName = 'ValidateCodeForm';
diff --git a/src/pages/signin/ValidateCodeForm/index.js b/src/pages/signin/ValidateCodeForm/index.js
index e60c30bff359..6b01c7d4dec2 100644
--- a/src/pages/signin/ValidateCodeForm/index.js
+++ b/src/pages/signin/ValidateCodeForm/index.js
@@ -1,21 +1,11 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import BaseValidateCodeForm from './BaseValidateCodeForm';
 
-const defaultProps = {
-    isVisible: false,
-};
+const defaultProps = {};
 
-const propTypes = {
-    isVisible: PropTypes.bool,
-};
-function ValidateCodeForm(props) {
-    return (
-        <BaseValidateCodeForm
-            isVisible={props.isVisible}
-            autoComplete="one-time-code"
-        />
-    );
+const propTypes = {};
+function ValidateCodeForm() {
+    return <BaseValidateCodeForm autoComplete="one-time-code" />;
 }
 
 ValidateCodeForm.displayName = 'ValidateCodeForm';