diff --git a/src/components/LanguageSwitcher.tsx b/src/components/LanguageSwitcher.tsx
index 4d108149a9..329b7cb881 100644
--- a/src/components/LanguageSwitcher.tsx
+++ b/src/components/LanguageSwitcher.tsx
@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useEffect } from "react";
 import { useLanguage } from "./LanguageContext";
 import clsx from "clsx";
 
@@ -19,6 +19,12 @@ export default function LanguageSwitcher({
 }: LanguageSwitcherProps) {
   const { language, setLanguage } = useLanguage();
 
+  useEffect(() => {
+      if (!supportedLanguages.includes(language)) {
+          setLanguage(supportedLanguages[0]);
+      }
+  }, [supportedLanguages, language, setLanguage]);
+
   return (
     <div className="flex flex-wrap gap-2 mb-8">
       {languages
diff --git a/src/theme/DocItem/index.tsx b/src/theme/DocItem/index.tsx
index df8f0ffa7c..8f1e6c290b 100644
--- a/src/theme/DocItem/index.tsx
+++ b/src/theme/DocItem/index.tsx
@@ -2,7 +2,6 @@ import React, { type ReactNode } from "react";
 import DocItem from "@theme-original/DocItem";
 import type DocItemType from "@theme/DocItem";
 import type { WrapperProps } from "@docusaurus/types";
-import { LanguageProvider } from "../../components/LanguageContext";
 
 type Props = WrapperProps<typeof DocItemType>;
 
@@ -12,13 +11,11 @@ export default function DocItemWrapper(props: Props): ReactNode {
     title === "RavenDB Documentation" ||
     title === "RavenDB Cloud Documentation";
 
-  return (
+    return (
     <div className="wrapper row">
-      <LanguageProvider>
-        <div className="col flex-1 min-w-0">
-          <DocItem {...props} />
-        </div>
-      </LanguageProvider>
+      <div className="col flex-1 min-w-0">
+        <DocItem {...props} />
+      </div>
       {!isHomePage && <div className="col col--3 lg:block"></div>}
     </div>
   );
diff --git a/src/theme/DocsRoot/index.tsx b/src/theme/DocsRoot/index.tsx
new file mode 100644
index 0000000000..3b61d0a614
--- /dev/null
+++ b/src/theme/DocsRoot/index.tsx
@@ -0,0 +1,18 @@
+import React, {type ReactNode} from 'react';
+import clsx from 'clsx';
+import {ThemeClassNames, HtmlClassNameProvider} from '@docusaurus/theme-common';
+import renderRoutes from '@docusaurus/renderRoutes';
+import Layout from '@theme/Layout';
+
+import type {Props} from '@theme/DocVersionRoot';
+import { LanguageProvider } from '@site/src/components/LanguageContext';
+
+export default function DocsRoot(props: Props): ReactNode {
+  return (
+      <LanguageProvider>
+        <HtmlClassNameProvider className={clsx(ThemeClassNames.wrapper.docsPages)}>
+          <Layout>{renderRoutes(props.route.routes!)}</Layout>
+        </HtmlClassNameProvider>
+      </LanguageProvider>
+  );
+}