diff --git a/js-packages/search-frontend/src/components/SortResultList.tsx b/js-packages/search-frontend/src/components/SortResultList.tsx
index b3334b3d0..4265aa02a 100644
--- a/js-packages/search-frontend/src/components/SortResultList.tsx
+++ b/js-packages/search-frontend/src/components/SortResultList.tsx
@@ -63,7 +63,7 @@ export function SortResultList({
         </option>
         {options.data?.map((option) => {
           return (
-            <React.Fragment>
+            <React.Fragment key={option.id + "fragment"}>
               <option
                 key={option.id + "asc"}
                 value={JSON.stringify({
diff --git a/js-packages/search-frontend/src/components/client.ts b/js-packages/search-frontend/src/components/client.ts
index 0658be702..a552a1a85 100644
--- a/js-packages/search-frontend/src/components/client.ts
+++ b/js-packages/search-frontend/src/components/client.ts
@@ -106,6 +106,20 @@ export function OpenK9Client({
         await response.json();
       return data;
     },
+    async getLanguageDefault() {
+      const response = await authFetch(
+        `/api/datasource/buckets/current/defaultLanguage`,
+        {
+          method: "GET",
+          headers: { Accept: "application/json" },
+        },
+      );
+      if (!response.ok) {
+        throw new Error();
+      }
+      const data: { value: string } = await response.json();
+      return data;
+    },
     async getSuggestions({
       searchQuery,
       suggestionCategoryId,
diff --git a/js-packages/search-frontend/src/embeddable/Main.tsx b/js-packages/search-frontend/src/embeddable/Main.tsx
index 7f1b2b092..0ddda2b28 100644
--- a/js-packages/search-frontend/src/embeddable/Main.tsx
+++ b/js-packages/search-frontend/src/embeddable/Main.tsx
@@ -31,12 +31,13 @@ import { SortResultList } from "../components/SortResultList";
 import { FiltersHorizontalMemo } from "../components/FiltersHorizontal";
 import { DetailMobileMemo } from "../components/DetailMobile";
 import "../i18n";
-import { I18nextProvider } from "react-i18next";
+import { I18nextProvider, useTranslation } from "react-i18next";
 import i18next from "i18next";
 import { ActiveFilter } from "../components/ActiveFilters";
 import { FiltersMobileMemo } from "../components/FiltersMobile";
 import { FiltersMobileLiveChangeMemo } from "../components/FiltersMobileLiveChange";
 import { DataRangePicker } from "../components/DateRangePicker";
+
 type MainProps = {
   configuration: Configuration;
   onConfigurationChange: ConfigurationUpdateFunction;
@@ -77,6 +78,17 @@ export function Main({
   const dynamicFilters = useQuery(["handle-dynamic-filters", {}], async () => {
     return await client.handle_dynamic_filters();
   });
+  const defaultLanguage = "en";
+  const language = useQuery(["language", {}], async () => {
+    return await client.getLanguageDefault();
+  });
+  const { i18n } = useTranslation();
+  React.useEffect(() => {
+    i18n.changeLanguage(
+      remappingLanguage({ language: language.data?.value || defaultLanguage }),
+    );
+  }, []);
+
   const [isMobile, setIsMobile] = React.useState(false);
   React.useEffect(() => {
     const checkIfMobile = () => {
@@ -633,3 +645,18 @@ function fixQueryAnalysisResult(data: AnalysisResponse) {
       }),
   };
 }
+
+function remappingLanguage({ language }: { language: string }) {
+  switch (language) {
+    case "it_IT":
+      return "it";
+    case "es_ES":
+      return "es;";
+    case "en_US":
+      return "en";
+    case "fr_FR":
+      return "fr";
+    default:
+      return "en";
+  }
+}