diff --git a/src/frontend/src/contexts/BaseContext.tsx b/src/frontend/src/contexts/BaseContext.tsx
index de8646d11c..e7dfb3c32e 100644
--- a/src/frontend/src/contexts/BaseContext.tsx
+++ b/src/frontend/src/contexts/BaseContext.tsx
@@ -1,15 +1,12 @@
 import { QueryClientProvider } from '@tanstack/react-query';
 
 import { queryClient } from '../App';
-import { LanguageContext } from './LanguageContext';
 import { ThemeContext } from './ThemeContext';
 
 export const BaseContext = ({ children }: { children: any }) => {
   return (
     <QueryClientProvider client={queryClient}>
-      <ThemeContext>
-        <LanguageContext>{children}</LanguageContext>
-      </ThemeContext>
+      <ThemeContext>{children}</ThemeContext>
     </QueryClientProvider>
   );
 };
diff --git a/src/frontend/src/contexts/ThemeContext.tsx b/src/frontend/src/contexts/ThemeContext.tsx
index a7d5a3c409..e5562c58fa 100644
--- a/src/frontend/src/contexts/ThemeContext.tsx
+++ b/src/frontend/src/contexts/ThemeContext.tsx
@@ -8,6 +8,7 @@ import { LicenseModal } from '../components/modals/LicenseModal';
 import { QrCodeModal } from '../components/modals/QrCodeModal';
 import { ServerInfoModal } from '../components/modals/ServerInfoModal';
 import { useLocalState } from '../states/LocalState';
+import { LanguageContext } from './LanguageContext';
 import { colorSchema } from './colorSchema';
 
 export function ThemeContext({ children }: { children: JSX.Element }) {
@@ -37,18 +38,20 @@ export function ThemeContext({ children }: { children: JSX.Element }) {
 
   return (
     <MantineProvider theme={myTheme} colorSchemeManager={colorSchema}>
-      <Notifications />
-      <ModalsProvider
-        labels={{ confirm: t`Submit`, cancel: t`Cancel` }}
-        modals={{
-          qr: QrCodeModal,
-          info: ServerInfoModal,
-          about: AboutInvenTreeModal,
-          license: LicenseModal
-        }}
-      >
-        {children}
-      </ModalsProvider>
+      <LanguageContext>
+        <ModalsProvider
+          labels={{ confirm: t`Submit`, cancel: t`Cancel` }}
+          modals={{
+            qr: QrCodeModal,
+            info: ServerInfoModal,
+            about: AboutInvenTreeModal,
+            license: LicenseModal
+          }}
+        >
+          <Notifications />
+          {children}
+        </ModalsProvider>
+      </LanguageContext>
     </MantineProvider>
   );
 }