diff --git a/src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx b/src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx index f5485dfa58ab..dfee68138f43 100644 --- a/src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx +++ b/src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx @@ -109,7 +109,8 @@ function ReimbursementAccountPage({route, policy, isLoadingPolicy, navigation}: const contactMethodRoute = `${environmentURL}/${ROUTES.SETTINGS_CONTACT_METHODS.getRoute(backTo)}`; const achData = reimbursementAccount?.achData; - const isPreviousPolicy = isLoadingOnyxValue(reimbursementAccountMetadata) ? true : policyIDParam === achData?.policyID; + const isPreviousPolicy = + !!reimbursementAccount && !isLoadingOnyxValue(reimbursementAccountMetadata) ? policyIDParam === achData?.policyID : isLoadingOnyxValue(reimbursementAccountMetadata); const hasConfirmedUSDCurrency = (reimbursementAccountDraft?.[INPUT_IDS.ADDITIONAL_DATA.COUNTRY] ?? '') !== '' || (achData?.accountNumber ?? '') !== ''; const isDocusignStepRequired = requiresDocusignStep(policyCurrency); @@ -173,7 +174,7 @@ function ReimbursementAccountPage({route, policy, isLoadingPolicy, navigation}: } useEffect(() => { - if (isPreviousPolicy) { + if (isPreviousPolicy && !!reimbursementAccount) { return; }