diff --git a/src/CONST.ts b/src/CONST.ts
index 70fecab70c39..39414cbad3a7 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -991,8 +991,6 @@ const CONST = {
     MAGIC_CODE_LENGTH: 6,
     MAGIC_CODE_EMPTY_CHAR: ' ',
 
-    RECOVERY_CODE_LENGTH: 8,
-
     KEYBOARD_TYPE: {
         VISIBLE_PASSWORD: 'visible-password',
         ASCII_CAPABLE: 'ascii-capable',
diff --git a/src/pages/signin/ValidateCodeForm/BaseValidateCodeForm.tsx b/src/pages/signin/ValidateCodeForm/BaseValidateCodeForm.tsx
index 428df32bf032..7d1caebb2e47 100755
--- a/src/pages/signin/ValidateCodeForm/BaseValidateCodeForm.tsx
+++ b/src/pages/signin/ValidateCodeForm/BaseValidateCodeForm.tsx
@@ -143,7 +143,7 @@ function BaseValidateCodeForm({account, credentials, session, autoComplete, isUs
             setTwoFactorAuthCode(text);
         }
         if (key === 'recoveryCode') {
-            setRecoveryCode(text);
+            setRecoveryCode(text.trim());
         }
 
         setFormError((prevError) => ({...prevError, [key]: undefined}));
@@ -290,7 +290,7 @@ function BaseValidateCodeForm({account, credentials, session, autoComplete, isUs
                             accessibilityLabel={translate('recoveryCodeForm.recoveryCode')}
                             value={recoveryCode}
                             onChangeText={(text) => onTextInput(text, 'recoveryCode')}
-                            maxLength={CONST.RECOVERY_CODE_LENGTH}
+                            maxLength={CONST.FORM_CHARACTER_LIMIT}
                             label={translate('recoveryCodeForm.recoveryCode')}
                             errorText={formError?.recoveryCode ?? ''}
                             hasError={hasError}