diff --git a/backend/app/controllers/spree/admin/general_settings_controller.rb b/backend/app/controllers/spree/admin/general_settings_controller.rb
index 2b51004e030..e557fd67fbc 100644
--- a/backend/app/controllers/spree/admin/general_settings_controller.rb
+++ b/backend/app/controllers/spree/admin/general_settings_controller.rb
@@ -26,11 +26,6 @@ def clear_cache
         head :no_content
       end
 
-      def render(*args)
-        @preferences_currency |= [:show_store_selector]
-        super
-      end
-
       private
 
       def update_currency_settings
diff --git a/backend/app/views/spree/admin/general_settings/edit.html.erb b/backend/app/views/spree/admin/general_settings/edit.html.erb
index 787396b4caa..8267e9d2b94 100644
--- a/backend/app/views/spree/admin/general_settings/edit.html.erb
+++ b/backend/app/views/spree/admin/general_settings/edit.html.erb
@@ -75,27 +75,6 @@
               </div>
             </div>
           </div>
-
-          <div class="card mb-3" id="general-settings-stores" data-hook="general_settings_stores">
-            <div class="card-header">
-              <h1 class="card-title mb-0 h5">
-                <%= Spree.t(:multiple_stores) %>
-              </h1>
-            </div>
-            <div class="card-body">
-              <div class="alert alert-warning col-12">
-                <%= Spree.t('show_store_selector.long') %>
-              </div>
-              <div class="form-group">
-                <div class="checkbox">
-                  <label>
-                    <%= check_box('', :show_store_selector, { checked: Spree::Config.show_store_selector }) %>
-                    <%= Spree.t('show_store_selector.short') %>
-                  </label>
-                </div>
-              </div>
-            </div>
-          </div>
         </div>
       </div>
 
diff --git a/backend/spec/features/admin/general_settings/prices_settings_presence_spec.rb b/backend/spec/features/admin/general_settings/prices_settings_presence_spec.rb
deleted file mode 100644
index 4e00a5e72c2..00000000000
--- a/backend/spec/features/admin/general_settings/prices_settings_presence_spec.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-require 'spec_helper'
-
-describe 'Currencies settings presence', type: :feature, js: true do
-  stub_authorization!
-
-  context 'when accessing general settings page' do
-    it 'Multi Currency settings are present' do
-      visit spree.edit_admin_general_settings_path
-
-      expect(page).to have_content 'Show Store selector'
-    end
-  end
-end
diff --git a/backend/spec/features/admin/general_settings/prices_settings_updating_spec.rb b/backend/spec/features/admin/general_settings/prices_settings_updating_spec.rb
index 32210302ae3..a3d3ff0d8e9 100644
--- a/backend/spec/features/admin/general_settings/prices_settings_updating_spec.rb
+++ b/backend/spec/features/admin/general_settings/prices_settings_updating_spec.rb
@@ -4,50 +4,6 @@
   let!(:store) { create(:store, default: true) }
   stub_authorization!
 
-  describe 'enabling currency settings' do
-    before do
-      reset_spree_preferences do |config|
-        config.show_store_selector = false
-      end
-    end
-
-    it 'allows to enable currency settings' do
-      visit spree.edit_admin_general_settings_path
-
-      # Test initial state
-      expect(page).to have_unchecked_field('show_store_selector')
-
-      # Interact with the form
-      check('show_store_selector')
-      click_button 'Update'
-
-      # Test final state
-      expect(page).to have_content 'General Settings has been successfully updated!'
-      expect(page).to have_checked_field('show_store_selector')
-      assert_admin_flash_alert_success('General Settings has been successfully updated!')
-    end
-  end
-
-  describe 'disabling currency settings' do
-    before do
-      reset_spree_preferences do |config|
-        config.show_store_selector = true
-      end
-    end
-
-    it 'allows to disable currency settings' do
-      visit spree.edit_admin_general_settings_path
-
-      expect(page).to have_checked_field('show_store_selector')
-
-      uncheck('show_store_selector')
-      click_button 'Update'
-
-      expect(page).to have_content 'General Settings has been successfully updated!'
-      expect(page).to have_unchecked_field('show_store_selector')
-    end
-  end
-
   describe 'clearing cache' do
     it 'returns flash alert of type success' do
       visit spree.edit_admin_general_settings_path
diff --git a/core/app/models/spree/app_configuration.rb b/core/app/models/spree/app_configuration.rb
index 04efb77b112..a1ecf7ff35f 100644
--- a/core/app/models/spree/app_configuration.rb
+++ b/core/app/models/spree/app_configuration.rb
@@ -72,7 +72,7 @@ class AppConfiguration < Preferences::Configuration
     preference :credit_to_new_allocation, :boolean, default: false
 
     # Multi store configurations
-    preference :show_store_selector, :boolean, default: false
+    preference :show_store_selector, :boolean, deprecated: true
 
     # searcher_class allows spree extension writers to provide their own Search class
     def searcher_class
diff --git a/frontend/app/helpers/spree/store_helper.rb b/frontend/app/helpers/spree/store_helper.rb
index d6acf2d2f2f..5ec9c8c46aa 100644
--- a/frontend/app/helpers/spree/store_helper.rb
+++ b/frontend/app/helpers/spree/store_helper.rb
@@ -28,7 +28,7 @@ def store_locale_name(store = nil)
     end
 
     def should_render_store_chooser?
-      Spree::Config.show_store_selector && stores.size > 1
+      Spree::Frontend::Config[:show_store_selector] && stores.size > 1
     end
 
     def store_link(store = nil, html_opts = {})
diff --git a/frontend/app/models/spree/frontend_configuration.rb b/frontend/app/models/spree/frontend_configuration.rb
index f6a132e3e1a..7969e768c51 100644
--- a/frontend/app/models/spree/frontend_configuration.rb
+++ b/frontend/app/models/spree/frontend_configuration.rb
@@ -9,6 +9,7 @@ class FrontendConfiguration < Preferences::Configuration
     preference :products_filters, :array, default: %w(keywords price sort_by)
     preference :remember_me_enabled, :boolean, default: true
     preference :show_raw_product_description, :boolean, default: false
+    preference :show_store_selector, :boolean, default: false
     preference :title_site_name_separator, :string, default: '-' # When always_put_site_name_in_title is true, insert a separator character before the site name in the title
   end
 end
diff --git a/frontend/spec/features/main_nav_bar_spec.rb b/frontend/spec/features/main_nav_bar_spec.rb
index 8039a7108ae..cc19a308159 100644
--- a/frontend/spec/features/main_nav_bar_spec.rb
+++ b/frontend/spec/features/main_nav_bar_spec.rb
@@ -12,9 +12,7 @@
       let!(:stores) { create_list(:store, stores_number, default_country: create(:country)) }
 
       before do
-        reset_spree_preferences do |config|
-          config.show_store_selector = true
-        end
+        Spree::Frontend::Config[:show_store_selector] = true
 
         visit spree.root_path
       end
@@ -51,9 +49,7 @@
       let!(:stores) { create_list(:store, stores_number) }
 
       before do
-        reset_spree_preferences do |config|
-          config.show_store_selector = false
-        end
+        Spree::Frontend::Config[:show_store_selector] = false
 
         visit spree.root_path
       end
diff --git a/frontend/spec/helpers/store_helper_spec.rb b/frontend/spec/helpers/store_helper_spec.rb
index 9f714a20bff..39fed2b85fb 100644
--- a/frontend/spec/helpers/store_helper_spec.rb
+++ b/frontend/spec/helpers/store_helper_spec.rb
@@ -47,9 +47,9 @@ module Spree
 
     describe '#should_render_store_chooser?' do
       context 'enabled' do
-        before { Spree::Config.show_store_selector = true }
+        before { Spree::Frontend::Config.show_store_selector = true }
 
-        after { Spree::Config.show_store_selector = false }
+        after { Spree::Frontend::Config.show_store_selector = false }
 
         context 'with 1 store' do
           it { expect(should_render_store_chooser?).to be_falsey }