diff --git a/webapp/components/LocaleSwitch/LocaleSwitch.vue b/webapp/components/LocaleSwitch/LocaleSwitch.vue
index 564de20f7..5c0d901c9 100644
--- a/webapp/components/LocaleSwitch/LocaleSwitch.vue
+++ b/webapp/components/LocaleSwitch/LocaleSwitch.vue
@@ -1,35 +1,37 @@
 <template>
-  <dropdown ref="menu" :placement="placement" :offset="offset">
-    <a
-      slot="default"
-      slot-scope="{ toggleMenu }"
-      class="locale-menu"
-      href="#"
-      @click.prevent="toggleMenu()"
-    >
-      <base-icon name="globe" />
-      <span class="label">{{ current.code.toUpperCase() }}</span>
-      <base-icon class="dropdown-arrow" name="angle-down" />
-    </a>
-    <ds-menu
-      slot="popover"
-      slot-scope="{ toggleMenu }"
-      class="locale-menu-popover"
-      :matcher="matcher"
-      :routes="routes"
-    >
-      <ds-menu-item
-        slot="menuitem"
-        slot-scope="item"
-        class="locale-menu-item"
-        :route="item.route"
-        :parents="item.parents"
-        @click.stop.prevent="changeLanguage(item.route.path, toggleMenu)"
+  <client-only>
+    <dropdown ref="menu" :placement="placement" :offset="offset">
+      <a
+        slot="default"
+        slot-scope="{ toggleMenu }"
+        class="locale-menu"
+        href="#"
+        @click.prevent="toggleMenu()"
       >
-        {{ item.route.name }}
-      </ds-menu-item>
-    </ds-menu>
-  </dropdown>
+        <base-icon name="globe" />
+        <span class="label">{{ current.code.toUpperCase() }}</span>
+        <base-icon class="dropdown-arrow" name="angle-down" />
+      </a>
+      <ds-menu
+        slot="popover"
+        slot-scope="{ toggleMenu }"
+        class="locale-menu-popover"
+        :matcher="matcher"
+        :routes="routes"
+      >
+        <ds-menu-item
+          slot="menuitem"
+          slot-scope="item"
+          class="locale-menu-item"
+          :route="item.route"
+          :parents="item.parents"
+          @click.stop.prevent="changeLanguage(item.route.path, toggleMenu)"
+        >
+          {{ item.route.name }}
+        </ds-menu-item>
+      </ds-menu>
+    </dropdown>
+  </client-only>
 </template>
 
 <script>
diff --git a/webapp/layouts/basic.vue b/webapp/layouts/basic.vue
index 6766390d2..431daeff1 100644
--- a/webapp/layouts/basic.vue
+++ b/webapp/layouts/basic.vue
@@ -10,9 +10,7 @@
             </a>
           </ds-flex-item>
           <ds-flex-item width="20%" style="flex-grow:0;">
-            <client-only>
-              <locale-switch class="topbar-locale-switch" placement="top" offset="16" />
-            </client-only>
+            <locale-switch class="topbar-locale-switch" placement="top" offset="16" />
           </ds-flex-item>
         </ds-flex>
       </ds-container>
diff --git a/webapp/layouts/default.vue b/webapp/layouts/default.vue
index de0e94af7..ab39deb99 100644
--- a/webapp/layouts/default.vue
+++ b/webapp/layouts/default.vue
@@ -50,9 +50,7 @@
                 }"
                 style="flex-basis: auto;"
               >
-                <client-only>
-                  <locale-switch class="topbar-locale-switch" placement="top" offset="8" />
-                </client-only>
+                <locale-switch class="topbar-locale-switch" placement="top" offset="8" />
                 <template v-if="isLoggedIn">
                   <client-only>
                     <notification-menu placement="top" />
diff --git a/webapp/maintenance/source/pages/index.vue b/webapp/maintenance/source/pages/index.vue
index 5893bf53e..1c176fb8b 100644
--- a/webapp/maintenance/source/pages/index.vue
+++ b/webapp/maintenance/source/pages/index.vue
@@ -1,11 +1,9 @@
 <template>
   <transition name="fade" appear>
     <ds-container width="medium">
-      <ds-card>
+      <base-card>
         <ds-space>
-          <client-only>
-            <locale-switch class="login-locale-switch" offset="5" />
-          </client-only>
+          <locale-switch class="login-locale-switch" offset="5" />
         </ds-space>
         <ds-flex>
           <ds-flex-item :width="{ base: '100%', sm: 1, md: 1 }">
@@ -31,7 +29,7 @@
             </ds-flex-item>
           </ds-flex-item>
         </ds-flex>
-      </ds-card>
+      </base-card>
     </ds-container>
   </transition>
 </template>
diff --git a/webapp/pages/registration.vue b/webapp/pages/registration.vue
index 695570d26..856e97b72 100644
--- a/webapp/pages/registration.vue
+++ b/webapp/pages/registration.vue
@@ -3,9 +3,7 @@
     <ds-card>
       <ds-flex gutter="small">
         <ds-flex-item :width="{ base: '100%', sm: '50%' }">
-          <client-only>
-            <locale-switch offset="5" />
-          </client-only>
+          <locale-switch offset="5" />
           <ds-space margin-top="small" margin-bottom="xxx-small">
             <img class="signup-image" alt="Human Connection" src="/img/sign-up/nicetomeetyou.svg" />
           </ds-space>