diff --git a/src/pages/workspace/upgrade/WorkspaceUpgradePage.tsx b/src/pages/workspace/upgrade/WorkspaceUpgradePage.tsx
index a8c9705663d4..2a744ce4bd2d 100644
--- a/src/pages/workspace/upgrade/WorkspaceUpgradePage.tsx
+++ b/src/pages/workspace/upgrade/WorkspaceUpgradePage.tsx
@@ -37,11 +37,19 @@ function WorkspaceUpgradePage({route}: WorkspaceUpgradePageProps) {
             return;
         }
         switch (feature.id) {
+            case CONST.UPGRADE_FEATURE_INTRO_MAPPING.approvals.id:
+                Navigation.goBack();
+                if (route.params.backTo) {
+                    Navigation.navigate(route.params.backTo);
+                }
+                return;
             case CONST.UPGRADE_FEATURE_INTRO_MAPPING.reportFields.id:
             case CONST.UPGRADE_FEATURE_INTRO_MAPPING.rules.id:
             case CONST.UPGRADE_FEATURE_INTRO_MAPPING.companyCards.id:
+                Navigation.dismissModal();
                 return Navigation.navigate(ROUTES.WORKSPACE_MORE_FEATURES.getRoute(policyID));
             default:
+                Navigation.dismissModal();
                 return route.params.backTo ? Navigation.navigate(route.params.backTo) : Navigation.goBack();
         }
     }, [feature, policyID, route.params.backTo]);
@@ -51,7 +59,7 @@ function WorkspaceUpgradePage({route}: WorkspaceUpgradePageProps) {
             return;
         }
 
-        Policy.upgradeToCorporate(policy.id, feature.name);
+        Policy.upgradeToCorporate(policy.id, feature?.name);
     };
 
     const confirmUpgrade = useCallback(() => {
@@ -97,7 +105,6 @@ function WorkspaceUpgradePage({route}: WorkspaceUpgradePageProps) {
                 title={translate('common.upgrade')}
                 onBackButtonPress={() => {
                     if (isUpgraded) {
-                        Navigation.dismissModal();
                         goBack();
                     } else {
                         Navigation.goBack();
@@ -106,10 +113,7 @@ function WorkspaceUpgradePage({route}: WorkspaceUpgradePageProps) {
             />
             {isUpgraded && (
                 <UpgradeConfirmation
-                    onConfirmUpgrade={() => {
-                        Navigation.dismissModal();
-                        goBack();
-                    }}
+                    onConfirmUpgrade={goBack}
                     policyName={policy.name}
                 />
             )}