diff --git a/app/services/user_locale_setter.rb b/app/services/user_locale_setter.rb
index 1f36f4ea66..1a5951df20 100644
--- a/app/services/user_locale_setter.rb
+++ b/app/services/user_locale_setter.rb
@@ -61,9 +61,9 @@ class UserLocaleSetter
   end
 
   def valid_current_locale
-    if available_locale?(current_user_locale)
+    if current_user_locale && available_locale?(current_user_locale)
       current_user_locale
-    elsif available_locale?(cookies[:locale])
+    elsif cookies[:locale] && available_locale?(cookies[:locale])
       cookies[:locale]
     else
       I18n.default_locale