diff --git a/src/libs/actions/Card.ts b/src/libs/actions/Card.ts
index 1c60d49e9170..c8dce813c895 100644
--- a/src/libs/actions/Card.ts
+++ b/src/libs/actions/Card.ts
@@ -392,8 +392,8 @@ function clearIssueNewCardFlow() {
     });
 }
 
-function clearIssueNewCardError(issueNewCard: IssueNewCardFlowData) {
-    Onyx.set(ONYXKEYS.ISSUE_NEW_EXPENSIFY_CARD, {...issueNewCard, errors: null});
+function clearIssueNewCardError() {
+    Onyx.merge(ONYXKEYS.ISSUE_NEW_EXPENSIFY_CARD, {errors: null});
 }
 
 function updateExpensifyCardLimit(workspaceAccountID: number, cardID: number, newLimit: number, newAvailableSpend: number, oldLimit?: number, oldAvailableSpend?: number) {
diff --git a/src/pages/workspace/expensifyCard/issueNew/ConfirmationStep.tsx b/src/pages/workspace/expensifyCard/issueNew/ConfirmationStep.tsx
index 07b888aaa5f0..154cc53a882c 100644
--- a/src/pages/workspace/expensifyCard/issueNew/ConfirmationStep.tsx
+++ b/src/pages/workspace/expensifyCard/issueNew/ConfirmationStep.tsx
@@ -143,15 +143,8 @@ function ConfirmationStep({policyID, backTo}: ConfirmationStepProps) {
                     sendValidateCode={() => User.requestValidateCodeAction()}
                     validateError={validateError}
                     hasMagicCodeBeenSent={validateCodeSent}
-                    clearError={() => {
-                        Card.clearIssueNewCardError(issueNewCard);
-                    }}
-                    onClose={() => {
-                        if (validateError) {
-                            Card.clearIssueNewCardError(issueNewCard);
-                        }
-                        setIsValidateCodeActionModalVisible(false);
-                    }}
+                    clearError={() => Card.clearIssueNewCardError()}
+                    onClose={() => setIsValidateCodeActionModalVisible(false)}
                     isVisible={isValidateCodeActionModalVisible}
                     title={translate('cardPage.validateCardTitle')}
                     descriptionPrimary={translate('cardPage.enterMagicCode', {contactMethod: account?.primaryLogin ?? ''})}
diff --git a/src/pages/workspace/expensifyCard/issueNew/IssueNewCardPage.tsx b/src/pages/workspace/expensifyCard/issueNew/IssueNewCardPage.tsx
index 2c9fbd1d193e..27653df9f9b0 100644
--- a/src/pages/workspace/expensifyCard/issueNew/IssueNewCardPage.tsx
+++ b/src/pages/workspace/expensifyCard/issueNew/IssueNewCardPage.tsx
@@ -34,12 +34,6 @@ function IssueNewCardPage({policy, route}: IssueNewCardPageProps) {
         Card.startIssueNewCardFlow(policyID);
     }, [policyID]);
 
-    useEffect(() => {
-        return () => {
-            Card.clearIssueNewCardFlow();
-        };
-    }, []);
-
     const getCurrentStep = () => {
         switch (currentStep) {
             case CONST.EXPENSIFY_CARD.STEP.ASSIGNEE: