diff --git a/packages/p2p/src/components/buy-sell/buy-sell.jsx b/packages/p2p/src/components/buy-sell/buy-sell.jsx
index dad50f3f06ef..c959333e7924 100644
--- a/packages/p2p/src/components/buy-sell/buy-sell.jsx
+++ b/packages/p2p/src/components/buy-sell/buy-sell.jsx
@@ -26,7 +26,6 @@ const BuySell = () => {
         return () => {
             disposeIsListedReaction();
             disposeAdvertIntervalReaction();
-            buy_sell_store.setLocalCurrency(null);
         };
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
diff --git a/packages/p2p/src/stores/buy-sell-store.js b/packages/p2p/src/stores/buy-sell-store.js
index c200ddd90857..00ebe1acadcf 100644
--- a/packages/p2p/src/stores/buy-sell-store.js
+++ b/packages/p2p/src/stores/buy-sell-store.js
@@ -72,11 +72,14 @@ export default class BuySellStore extends BaseStore {
             is_sort_dropdown_open: observable,
             is_submit_disabled: observable,
             items: observable,
+            local_currencies: observable,
+            local_currency: observable,
             payment_info: observable,
             receive_amount: observable,
             search_results: observable,
             search_term: observable,
             selected_ad_state: observable,
+            selected_local_currency: observable,
             selected_payment_method_value: observable,
             selected_payment_method_text: observable,
             selected_value: observable,
diff --git a/packages/p2p/src/stores/general-store.js b/packages/p2p/src/stores/general-store.js
index 735f7047abe5..5ddc46ca3d33 100644
--- a/packages/p2p/src/stores/general-store.js
+++ b/packages/p2p/src/stores/general-store.js
@@ -67,6 +67,7 @@ export default class GeneralStore extends BaseStore {
             advertiser_sell_limit: observable,
             block_unblock_user_error: observable,
             balance: observable,
+            feature_level: observable,
             inactive_notification_count: observable,
             is_advertiser: observable,
             is_advertiser_blocked: observable,
@@ -475,7 +476,7 @@ export default class GeneralStore extends BaseStore {
             };
 
             this.disposeLocalCurrencyReaction = reaction(
-                () => this.root_store.buy_sell_store.local_currency,
+                () => [this.root_store.buy_sell_store.local_currency, this.active_index],
                 () => {
                     this.subscribeToLocalCurrency();
                 }
@@ -489,6 +490,7 @@ export default class GeneralStore extends BaseStore {
 
     subscribeToLocalCurrency() {
         const { floating_rate_store, buy_sell_store } = this.root_store;
+        const client_currency = this.client.local_currency_config?.currency;
 
         this.ws_subscriptions?.exchange_rate_subscription?.unsubscribe?.();
         this.ws_subscriptions.exchange_rate_subscription = subscribeWS(
@@ -496,7 +498,8 @@ export default class GeneralStore extends BaseStore {
                 exchange_rates: 1,
                 base_currency: this.client.currency,
                 subscribe: 1,
-                target_currency: buy_sell_store.local_currency ?? this.client.local_currency_config?.currency,
+                target_currency:
+                    this.active_index > 0 ? client_currency : buy_sell_store.local_currency ?? client_currency,
             },
             [floating_rate_store.fetchExchangeRate]
         );