diff --git a/app/components/layout/locale_switcher_component.html.erb b/app/components/layout/locale_switcher_component.html.erb
index 263e6b727..886925f65 100644
--- a/app/components/layout/locale_switcher_component.html.erb
+++ b/app/components/layout/locale_switcher_component.html.erb
@@ -1,15 +1,13 @@
-<% if I18n.available_locales.size > 1 %>
-  <div class="locale">
-    <form class="locale-form">
-      <label class="inline-block" for="locale-switcher">
-        <%= t("layouts.header.locale") %>
-      </label>
-      <select class="js-location-changer locale-switcher inline-block" name="locale-switcher" id="locale-switcher">
-        <% I18n.available_locales.map do |loc| %>
-          <option <%= "selected" if loc == I18n.locale %>
-                  value="<%= current_path_with_query_params(locale: loc) %>"><%= name_for_locale(loc) %></option>
-        <% end %>
-      </select>
-    </form>
-  </div>
-<% end %>
+<div class="locale">
+  <form class="locale-form">
+    <label class="inline-block" for="locale-switcher">
+      <%= t("layouts.header.locale") %>
+    </label>
+    <select class="js-location-changer locale-switcher inline-block" name="locale-switcher" id="locale-switcher">
+      <% locales.map do |loc| %>
+        <option <%= "selected" if loc == I18n.locale %>
+                value="<%= current_path_with_query_params(locale: loc) %>"><%= name_for_locale(loc) %></option>
+      <% end %>
+    </select>
+  </form>
+</div>
diff --git a/app/components/layout/locale_switcher_component.rb b/app/components/layout/locale_switcher_component.rb
index 45248ac14..e0182c2b4 100644
--- a/app/components/layout/locale_switcher_component.rb
+++ b/app/components/layout/locale_switcher_component.rb
@@ -1,3 +1,13 @@
 class Layout::LocaleSwitcherComponent < ApplicationComponent
   delegate :name_for_locale, :current_path_with_query_params, to: :helpers
+
+  def render?
+    locales.size > 1
+  end
+
+  private
+
+    def locales
+      I18n.available_locales
+    end
 end