diff --git a/packages/twenty-front/src/modules/error-handler/components/AppErrorBoundary.tsx b/packages/twenty-front/src/modules/error-handler/components/AppErrorBoundary.tsx
index eb80049a9..8f38b9e8e 100644
--- a/packages/twenty-front/src/modules/error-handler/components/AppErrorBoundary.tsx
+++ b/packages/twenty-front/src/modules/error-handler/components/AppErrorBoundary.tsx
@@ -1,7 +1,6 @@
 import { ErrorInfo, ReactNode } from 'react';
 import { ErrorBoundary } from 'react-error-boundary';
-import { ThemeProvider } from '@emotion/react';
-import { THEME_LIGHT } from 'twenty-ui';
+import { ThemeProvider, useTheme } from '@emotion/react';
 
 import { GenericErrorFallback } from '@/error-handler/components/GenericErrorFallback';
 
@@ -10,8 +9,10 @@ export const AppErrorBoundary = ({ children }: { children: ReactNode }) => {
     // TODO: log error to Sentry
   };
 
+  const theme = useTheme();
+
   return (
-    <ThemeProvider theme={THEME_LIGHT}>
+    <ThemeProvider theme={theme}>
       <ErrorBoundary
         FallbackComponent={GenericErrorFallback}
         onError={handleError}