diff --git a/src/app/[locale]/layout.js b/src/app/[locale]/layout.js
index c7966ab6..71410d17 100644
--- a/src/app/[locale]/layout.js
+++ b/src/app/[locale]/layout.js
@@ -2,15 +2,19 @@
 
 import { useCurrentLocale } from '@/locales/client'
 import { LocaleProvider } from './LocaleProvider'
+import ServerError from './error'
+import { ErrorBoundary } from 'next/dist/client/components/error-boundary'
 
 export default function LocaleLayout({ children }) {
   const locale = useCurrentLocale()
 
   return (
     <>
-      <LocaleProvider locale={locale} fallback={''}>
-        {children}
-      </LocaleProvider>
+      <ErrorBoundary fallback={<ServerError />}>
+        <LocaleProvider locale={locale} fallback={<ServerError />}>
+          {children}
+        </LocaleProvider>
+      </ErrorBoundary>
     </>
   )
 }