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