diff --git a/packages/theme/components/TopBar.vue b/packages/theme/components/TopBar.vue
index 97498a349..ed492730b 100644
--- a/packages/theme/components/TopBar.vue
+++ b/packages/theme/components/TopBar.vue
@@ -12,7 +12,13 @@
       </SfButton>
     </template>
     <template #right>
-      <CurrencySelector />
+      <!--
+      /**
+       * The currency switch is commented, until the Core package
+       * enables the switch of currency without returning to the browser one with i18n
+       */
+        <CurrencySelector />
+      -->
       <StoreSwitcher />
     </template>
   </SfTopBar>
@@ -20,12 +26,12 @@
 
 <script>
 import { SfButton, SfTopBar } from '@storefront-ui/vue';
-import CurrencySelector from './CurrencySelector';
+// import CurrencySelector from './CurrencySelector';
 import StoreSwitcher from './StoreSwitcher';
 
 export default {
   components: {
-    CurrencySelector,
+    // CurrencySelector,
     SfTopBar,
     SfButton,
     StoreSwitcher,
diff --git a/packages/theme/nuxt.config.js b/packages/theme/nuxt.config.js
index 3ee02c197..3a3ac27bd 100755
--- a/packages/theme/nuxt.config.js
+++ b/packages/theme/nuxt.config.js
@@ -159,9 +159,7 @@ export default {
     ],
     defaultLocale: 'default',
     autoChangeCookie: {
-      currency: false,
       locale: false,
-      country: false,
     },
     lazy: true,
     seo: true,