diff --git a/apps/web/src/i18n.ts b/apps/web/src/i18n.ts
index ca7d5f9..8e9118c 100644
--- a/apps/web/src/i18n.ts
+++ b/apps/web/src/i18n.ts
@@ -1,4 +1,3 @@
-import { notFound } from 'next/navigation';
 import { getRequestConfig } from 'next-intl/server';
 
 export const locales = ['it'] as const;
@@ -6,13 +5,14 @@ export const defaultLocale = 'it' as const;
 
 export type Locale = (typeof locales)[number];
 
-export default getRequestConfig(async ({ locale }) => {
-  if (!locales.includes(locale as Locale)) {
-    notFound();
-  }
+export default getRequestConfig(async ({ requestLocale }) => {
+  const requested = await requestLocale;
+  const locale: Locale = locales.includes(requested as Locale)
+    ? (requested as Locale)
+    : defaultLocale;
 
   return {
-    locale: locale as Locale,
+    locale,
     messages: (await import(`../messages/${locale}.json`)).default,
   };
 });