diff --git a/packages/core/src/App/Containers/Modals/exit-traders-hub-modal/exit-traders-hub-modal.jsx b/packages/core/src/App/Containers/Modals/exit-traders-hub-modal/exit-traders-hub-modal.jsx
index df02512c6bb2..036583c7a742 100644
--- a/packages/core/src/App/Containers/Modals/exit-traders-hub-modal/exit-traders-hub-modal.jsx
+++ b/packages/core/src/App/Containers/Modals/exit-traders-hub-modal/exit-traders-hub-modal.jsx
@@ -48,7 +48,7 @@ const ExitTradersHubModal = ({
         const cr_account = active_accounts.some(acc => acc.landing_company_shortcode === 'svg');
         toggleExitTradersHubModal();
 
-        if (content_flag === ContentFlag.LOW_RISK_CR_EU) {
+        if (content_flag === ContentFlag.LOW_RISK_CR_EU || content_flag === ContentFlag.LOW_RISK_CR_NON_EU) {
             if (!cr_account) {
                 await switchAccount(account_list.find(acc => acc.loginid.startsWith('VRTC'))?.loginid);
             }
diff --git a/packages/core/src/Stores/client-store.js b/packages/core/src/Stores/client-store.js
index d1170d7f4db1..75e479b84584 100644
--- a/packages/core/src/Stores/client-store.js
+++ b/packages/core/src/Stores/client-store.js
@@ -1615,6 +1615,11 @@ export default class ClientStore extends BaseStore {
             if (!this.is_virtual) {
                 this.setPrevRealAccountLoginid(this.loginid);
             }
+            const no_cr_account = this.active_accounts.some(acc => acc.landing_company_shortcode === 'svg');
+
+            if (!no_cr_account && this.is_low_risk) {
+                this.switchAccount(this.virtual_account_loginid);
+            }
         }
 
         this.selectCurrency('');