diff --git a/app/helpers/i18n_helper.rb b/app/helpers/i18n_helper.rb
index c37d036f62..5ce1539f05 100644
--- a/app/helpers/i18n_helper.rb
+++ b/app/helpers/i18n_helper.rb
@@ -7,7 +7,7 @@ module I18nHelper
     end
 
     # After logging in, check if the user chose a locale before
-    if current_user_locale.nil? && cookies[:locale]
+    if current_user_locale.nil? && cookies[:locale] && available_locale?(params[:locale])
       spree_current_user&.update!(locale: params[:locale])
     end