diff --git a/app/layout.tsx b/app/[locale]/layout.tsx
similarity index 100%
rename from app/layout.tsx
rename to app/[locale]/layout.tsx
diff --git a/app/[locale]/not-found.tsx b/app/[locale]/not-found.tsx
index c0a4758a0e9b1..34c2edd6288f8 100644
--- a/app/[locale]/not-found.tsx
+++ b/app/[locale]/not-found.tsx
@@ -1,3 +1,15 @@
-import NotFound from '@/app/not-found';
+import { useTranslations } from 'next-intl';
+import type { FC } from 'react';
 
-export default NotFound;
+const LocalizedNotFound: FC = () => {
+  const t = useTranslations();
+
+  return (
+    <div className="container">
+      <h2>{t('pages.404.title')}</h2>
+      <h3>{t('pages.404.description')}</h3>
+    </div>
+  );
+};
+
+export default LocalizedNotFound;
diff --git a/app/not-found.tsx b/app/not-found.tsx
deleted file mode 100644
index d59a8cf140a16..0000000000000
--- a/app/not-found.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import { useTranslations } from 'next-intl';
-import type { FC } from 'react';
-
-const NotFound: FC = () => {
-  const t = useTranslations();
-
-  return (
-    <div className="container">
-      <h2>{t('pages.404.title')}</h2>
-      <h3>{t('pages.404.description')}</h3>
-    </div>
-  );
-};
-
-// This is a fallback Not Found Page that in theory should never be requested
-export const dynamic = 'force-dynamic';
-
-export default NotFound;