diff --git a/messages/en.json b/messages/en.json
new file mode 100644
index 000000000..841cfe485
--- /dev/null
+++ b/messages/en.json
@@ -0,0 +1,7 @@
+{
+  "CustomerCase": {
+    "customer": "Customer",
+    "project": "Project",
+    "duration": "Duration"
+  }
+}
diff --git a/messages/no.json b/messages/no.json
new file mode 100644
index 000000000..9bf33abe5
--- /dev/null
+++ b/messages/no.json
@@ -0,0 +1,7 @@
+{
+  "CustomerCase": {
+    "customer": "Kunde",
+    "project": "Prosjekt",
+    "duration": "Varighet"
+  }
+}
diff --git a/messages/se.json b/messages/se.json
new file mode 100644
index 000000000..36c2c2856
--- /dev/null
+++ b/messages/se.json
@@ -0,0 +1,7 @@
+{
+  "CustomerCase": {
+    "customer": "Kund",
+    "project": "Projekt",
+    "duration": "Varaktighet"
+  }
+}
diff --git a/next.config.mjs b/next.config.mjs
index e8fee5052..5b91aedf2 100644
--- a/next.config.mjs
+++ b/next.config.mjs
@@ -1,3 +1,7 @@
+import createNextIntlPlugin from "next-intl/plugin";
+
+const withNextIntl = createNextIntlPlugin();
+
 /** @type {import('next').NextConfig} */
 const nextConfig = {
   images: {
@@ -17,4 +21,4 @@ const nextConfig = {
   },
 };
 
-export default nextConfig;
+export default withNextIntl(nextConfig);
diff --git a/package-lock.json b/package-lock.json
index bc307e2d6..37f1fb773 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,6 +15,7 @@
         "@sanity/vision": "^3.39.1",
         "negotiator": "^0.6.3",
         "next": "^14.2.15",
+        "next-intl": "^3.24.0",
         "next-sanity": "^7.1.4",
         "next-sanity-image": "^6.1.1",
         "react": "^18.3.1",
@@ -2941,6 +2942,56 @@
       "integrity": "sha512-X8R8Oj771YRl/w+c1HqAC1szL8zWQRwFvgDwT129k9ACdBoud/+/rX9V0qiMl6LWUdP9voC2nDVZYPMQQsb6eA==",
       "license": "MIT"
     },
+    "node_modules/@formatjs/ecma402-abstract": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-2.2.3.tgz",
+      "integrity": "sha512-aElGmleuReGnk2wtYOzYFmNWYoiWWmf1pPPCYg0oiIQSJj0mjc4eUfzUXaSOJ4S8WzI/cLqnCTWjqz904FT2OQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@formatjs/fast-memoize": "2.2.3",
+        "@formatjs/intl-localematcher": "0.5.7",
+        "tslib": "2"
+      }
+    },
+    "node_modules/@formatjs/fast-memoize": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/@formatjs/fast-memoize/-/fast-memoize-2.2.3.tgz",
+      "integrity": "sha512-3jeJ+HyOfu8osl3GNSL4vVHUuWFXR03Iz9jjgI7RwjG6ysu/Ymdr0JRCPHfF5yGbTE6JCrd63EpvX1/WybYRbA==",
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "2"
+      }
+    },
+    "node_modules/@formatjs/icu-messageformat-parser": {
+      "version": "2.9.3",
+      "resolved": "https://registry.npmjs.org/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.9.3.tgz",
+      "integrity": "sha512-9L99QsH14XjOCIp4TmbT8wxuffJxGK8uLNO1zNhLtcZaVXvv626N0s4A2qgRCKG3dfYWx9psvGlFmvyVBa6u/w==",
+      "license": "MIT",
+      "dependencies": {
+        "@formatjs/ecma402-abstract": "2.2.3",
+        "@formatjs/icu-skeleton-parser": "1.8.7",
+        "tslib": "2"
+      }
+    },
+    "node_modules/@formatjs/icu-skeleton-parser": {
+      "version": "1.8.7",
+      "resolved": "https://registry.npmjs.org/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.8.7.tgz",
+      "integrity": "sha512-fI+6SmS2g7h3srfAKSWa5dwreU5zNEfon2uFo99OToiLF6yxGE+WikvFSbsvMAYkscucvVmTYNlWlaDPp0n5HA==",
+      "license": "MIT",
+      "dependencies": {
+        "@formatjs/ecma402-abstract": "2.2.3",
+        "tslib": "2"
+      }
+    },
+    "node_modules/@formatjs/intl-localematcher": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.5.7.tgz",
+      "integrity": "sha512-GGFtfHGQVFe/niOZp24Kal5b2i36eE2bNL0xi9Sg/yd0TR8aLjcteApZdHmismP5QQax1cMnZM9yWySUUjJteA==",
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "2"
+      }
+    },
     "node_modules/@hapi/hoek": {
       "version": "9.3.0",
       "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz",
@@ -15888,6 +15939,18 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/intl-messageformat": {
+      "version": "10.7.6",
+      "resolved": "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-10.7.6.tgz",
+      "integrity": "sha512-IsMU/hqyy3FJwNJ0hxDfY2heJ7MteSuFvcnCebxRp67di4Fhx1gKKE+qS0bBwUF8yXkX9SsPUhLeX/B6h5SKUA==",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@formatjs/ecma402-abstract": "2.2.3",
+        "@formatjs/fast-memoize": "2.2.3",
+        "@formatjs/icu-messageformat-parser": "2.9.3",
+        "tslib": "2"
+      }
+    },
     "node_modules/invariant": {
       "version": "2.2.4",
       "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
@@ -19916,6 +19979,36 @@
         }
       }
     },
+    "node_modules/next-intl": {
+      "version": "3.24.0",
+      "resolved": "https://registry.npmjs.org/next-intl/-/next-intl-3.24.0.tgz",
+      "integrity": "sha512-48X68QsI92grir2dH1W15yhyVnEjW4c9qmwNt+du+k6mI1QtlE6GyANWHoL4/leTixHv8knZ1y9B/Ys06gmKLg==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/amannn"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "@formatjs/intl-localematcher": "^0.5.4",
+        "negotiator": "^1.0.0",
+        "use-intl": "^3.24.0"
+      },
+      "peerDependencies": {
+        "next": "^10.0.0 || ^11.0.0 || ^12.0.0 || ^13.0.0 || ^14.0.0 || ^15.0.0",
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || >=19.0.0-rc <19.0.0"
+      }
+    },
+    "node_modules/next-intl/node_modules/negotiator": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-1.0.0.tgz",
+      "integrity": "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
     "node_modules/next-sanity": {
       "version": "7.1.4",
       "resolved": "https://registry.npmjs.org/next-sanity/-/next-sanity-7.1.4.tgz",
@@ -26799,6 +26892,19 @@
         "react": ">=17.0.0"
       }
     },
+    "node_modules/use-intl": {
+      "version": "3.24.0",
+      "resolved": "https://registry.npmjs.org/use-intl/-/use-intl-3.24.0.tgz",
+      "integrity": "sha512-lmrARod7yjMYehbyY9xBLjjgnlNcJsl1UAltAPlgspRG7RH6H0JYaGo4C3PZW/BTy0Dgmcvcl8rH/VemzGIhgQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@formatjs/fast-memoize": "^2.2.0",
+        "intl-messageformat": "^10.5.14"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || >=19.0.0-rc <19.0.0"
+      }
+    },
     "node_modules/use-isomorphic-layout-effect": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.2.tgz",
diff --git a/package.json b/package.json
index 59895efbd..ef184eafd 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
     "@sanity/vision": "^3.39.1",
     "negotiator": "^0.6.3",
     "next": "^14.2.15",
+    "next-intl": "^3.24.0",
     "next-sanity": "^7.1.4",
     "next-sanity-image": "^6.1.1",
     "react": "^18.3.1",
diff --git a/src/app/(main)/[lang]/[...path]/page.tsx b/src/app/(main)/[locale]/[...path]/page.tsx
similarity index 96%
rename from src/app/(main)/[lang]/[...path]/page.tsx
rename to src/app/(main)/[locale]/[...path]/page.tsx
index 1a4e150eb..b3be90347 100644
--- a/src/app/(main)/[lang]/[...path]/page.tsx
+++ b/src/app/(main)/[locale]/[...path]/page.tsx
@@ -25,7 +25,7 @@ import {
 export const dynamic = "force-dynamic";
 
 type Props = {
-  params: { lang: string; path: string[] };
+  params: { locale: string; path: string[] };
 };
 
 function seoDataFromPageData(
@@ -52,7 +52,7 @@ function seoDataFromPageData(
 
 export async function generateMetadata({ params }: Props): Promise<Metadata> {
   const { perspective } = getDraftModeInfo();
-  const language = params.lang;
+  const language = params.locale;
   const pageData = await fetchPageDataFromParams({
     language,
     path: params.path,
@@ -71,12 +71,12 @@ const Page404 = (
 );
 
 async function Page({ params }: Props) {
-  const { lang, path } = params;
+  const { locale, path } = params;
 
   const { perspective, isDraftMode } = getDraftModeInfo();
 
   const pageData = await fetchPageDataFromParams({
-    language: lang,
+    language: locale,
     path,
     perspective: perspective ?? "published",
     hostname: headers().get("host"),
@@ -91,7 +91,7 @@ async function Page({ params }: Props) {
   return (
     <>
       <PageHeader
-        language={lang}
+        language={locale}
         pathTitles={pathTitles}
         pathTranslations={pathTranslations}
         showBreadcrumbs={true}
@@ -105,7 +105,7 @@ async function Page({ params }: Props) {
                   {queryResponse.data?.sections?.map((section, index) => (
                     <SectionRenderer
                       key={section._key}
-                      language={lang}
+                      language={locale}
                       section={section}
                       isDraftMode={isDraftMode}
                       initialData={queryResponse}
diff --git a/src/app/(main)/[lang]/layout.tsx b/src/app/(main)/[locale]/layout.tsx
similarity index 63%
rename from src/app/(main)/[lang]/layout.tsx
rename to src/app/(main)/[locale]/layout.tsx
index f0b4ad3d7..61d2842a8 100644
--- a/src/app/(main)/[lang]/layout.tsx
+++ b/src/app/(main)/[locale]/layout.tsx
@@ -1,9 +1,13 @@
 import localFont from "next/font/local";
 import { draftMode } from "next/headers";
+import { notFound } from "next/navigation";
+import { NextIntlClientProvider } from "next-intl";
+import { getMessages } from "next-intl/server";
 
 import Footer from "src/components/navigation/footer/Footer";
 import FooterPreview from "src/components/navigation/footer/FooterPreview";
 import SkipToMain from "src/components/skipToMain/SkipToMain";
+import { Locale, routing } from "src/i18n/routing";
 import { getDraftModeInfo } from "src/utils/draftmode";
 import { BrandAssets } from "studio/lib/interfaces/brandAssets";
 import { CompanyInfo } from "studio/lib/interfaces/companyDetails";
@@ -21,7 +25,6 @@ import {
   SOME_PROFILES_QUERY,
 } from "studio/lib/queries/siteSettings";
 import { loadStudioQuery } from "studio/lib/store";
-
 import "src/styles/global.css";
 
 const fontBrittiSans = localFont({
@@ -37,9 +40,15 @@ export default async function Layout({
 }: Readonly<{
   children: React.ReactNode;
   params: {
-    lang: string;
+    locale: string;
   };
 }>) {
+  if (!routing.locales.includes(params.locale as Locale)) {
+    notFound();
+  }
+
+  const messages = await getMessages();
+
   const { perspective, isDraftMode } = getDraftModeInfo();
 
   const [
@@ -51,7 +60,7 @@ export default async function Layout({
   ] = await Promise.all([
     loadStudioQuery<Navigation>(
       NAV_QUERY,
-      { language: params.lang },
+      { language: params.locale },
       { perspective },
     ),
     loadStudioQuery<CompanyInfo>(COMPANY_INFO_QUERY, {}, { perspective }),
@@ -62,7 +71,7 @@ export default async function Layout({
     ),
     loadStudioQuery<LegalDocument[]>(
       LEGAL_DOCUMENTS_BY_LANG_QUERY,
-      { language: params.lang },
+      { language: params.locale },
       { perspective },
     ),
     loadStudioQuery<BrandAssets>(BRAND_ASSETS_QUERY, {}, { perspective }),
@@ -73,29 +82,31 @@ export default async function Layout({
   const hasFooterData = hasNavData && initialNav.data.footer;
 
   return (
-    <html lang={params.lang}>
+    <html lang={params.locale}>
       <body className={fontBrittiSans.variable}>
-        <SkipToMain />
-        {children}
-        {hasFooterData && isDraftMode ? (
-          <FooterPreview
-            initialNav={initialNav}
-            initialCompanyInfo={initialCompanyInfo}
-            initialBrandAssets={initialBrandAssets}
-            initialSoMe={initialSoMe}
-            initialLegal={initialLegal}
-            language={params.lang}
-          />
-        ) : (
-          <Footer
-            navigationData={initialNav.data}
-            legalData={initialLegal.data}
-            companyInfo={initialCompanyInfo.data}
-            brandAssets={initialBrandAssets.data}
-            soMeData={initialSoMe.data}
-          />
-        )}
-        {draftMode().isEnabled && <LiveVisualEditing />}
+        <NextIntlClientProvider messages={messages}>
+          <SkipToMain />
+          {children}
+          {hasFooterData && isDraftMode ? (
+            <FooterPreview
+              initialNav={initialNav}
+              initialCompanyInfo={initialCompanyInfo}
+              initialBrandAssets={initialBrandAssets}
+              initialSoMe={initialSoMe}
+              initialLegal={initialLegal}
+              language={params.locale}
+            />
+          ) : (
+            <Footer
+              navigationData={initialNav.data}
+              legalData={initialLegal.data}
+              companyInfo={initialCompanyInfo.data}
+              brandAssets={initialBrandAssets.data}
+              soMeData={initialSoMe.data}
+            />
+          )}
+          {draftMode().isEnabled && <LiveVisualEditing />}
+        </NextIntlClientProvider>
       </body>
     </html>
   );
diff --git a/src/app/(main)/[lang]/page.tsx b/src/app/(main)/[locale]/page.tsx
similarity index 94%
rename from src/app/(main)/[lang]/page.tsx
rename to src/app/(main)/[locale]/page.tsx
index b032e69dc..82b7a25d6 100644
--- a/src/app/(main)/[lang]/page.tsx
+++ b/src/app/(main)/[locale]/page.tsx
@@ -20,10 +20,10 @@ export async function generateMetadata({ params }: Props): Promise<Metadata> {
   const { data: landingPage } = await loadStudioQuery<PageBuilder | null>(
     LANDING_PAGE_QUERY,
     {
-      language: params.lang,
+      language: params.locale,
     },
   );
-  return generateMetadataFromSeo(landingPage?.seo ?? null, params.lang);
+  return generateMetadataFromSeo(landingPage?.seo ?? null, params.locale);
 }
 
 const navigationManagerLink = {
@@ -35,7 +35,7 @@ const navigationManagerLink = {
 };
 
 type Props = {
-  params: { lang: string };
+  params: { locale: string };
 };
 
 const Home = async ({ params }: Props) => {
@@ -43,7 +43,7 @@ const Home = async ({ params }: Props) => {
 
   const initialLandingPage = await loadStudioQuery<PageBuilder | null>(
     LANDING_PAGE_QUERY,
-    { language: params.lang },
+    { language: params.locale },
     { perspective },
   );
 
@@ -72,7 +72,7 @@ const Home = async ({ params }: Props) => {
   return (
     <>
       <PageHeader
-        language={params.lang}
+        language={params.locale}
         pathTranslations={pathTranslations}
         pathTitles={[]}
         showBreadcrumbs={false}
@@ -81,7 +81,7 @@ const Home = async ({ params }: Props) => {
         {initialLandingPage.data.sections.map((section, index) => (
           <SectionRenderer
             key={section._key}
-            language={params.lang}
+            language={params.locale}
             section={section}
             isDraftMode={isDraftMode}
             initialData={initialLandingPage}
diff --git a/src/components/customerCases/customerCase/CustomerCase.tsx b/src/components/customerCases/customerCase/CustomerCase.tsx
index 7e55c09d2..a151aaa8b 100644
--- a/src/components/customerCases/customerCase/CustomerCase.tsx
+++ b/src/components/customerCases/customerCase/CustomerCase.tsx
@@ -1,3 +1,5 @@
+import { getTranslations } from "next-intl/server";
+
 import { SanitySharedImage } from "src/components/image/SanityImage";
 import Text from "src/components/text/Text";
 import { fetchEmployeesByEmails } from "src/utils/employees";
@@ -25,6 +27,8 @@ export default async function CustomerCase({
     customerCase.projectInfo.consultants,
   );
 
+  const t = await getTranslations("CustomerCase");
+
   return (
     <div className={styles.wrapper}>
       <div className={styles.content}>
@@ -41,7 +45,7 @@ export default async function CustomerCase({
           <div className={styles.projectInfo}>
             {customerCase.projectInfo.customer && (
               <div className={styles.projectInfoItem}>
-                <Text type={"labelRegular"}>Kunde</Text>
+                <Text type={"labelRegular"}>{t("customer")}</Text>
                 <Text
                   type={"labelLight"}
                   className={styles.projectInfoItemValue}
@@ -52,7 +56,7 @@ export default async function CustomerCase({
             )}
             {customerCase.projectInfo.name && (
               <div className={styles.projectInfoItem}>
-                <Text type={"labelRegular"}>Prosjekt</Text>
+                <Text type={"labelRegular"}>{t("project")}</Text>
                 <Text
                   type={"labelLight"}
                   className={styles.projectInfoItemValue}
@@ -63,7 +67,7 @@ export default async function CustomerCase({
             )}
             {customerCase.projectInfo.duration && (
               <div className={styles.projectInfoItem}>
-                <Text type={"labelRegular"}>Varighet</Text>
+                <Text type={"labelRegular"}>{t("duration")}</Text>
                 <Text
                   type={"labelLight"}
                   className={styles.projectInfoItemValue}
diff --git a/src/i18n/request.ts b/src/i18n/request.ts
new file mode 100644
index 000000000..509fa88cc
--- /dev/null
+++ b/src/i18n/request.ts
@@ -0,0 +1,18 @@
+import { getRequestConfig } from "next-intl/server";
+
+import { Locale, routing } from "./routing";
+
+export default getRequestConfig(async ({ requestLocale }) => {
+  let locale = await requestLocale;
+
+  if (!locale || !routing.locales.includes(locale as Locale)) {
+    locale = routing.defaultLocale;
+  }
+
+  const messages = (await import(`../../messages/${locale}.json`)).default;
+
+  return {
+    locale,
+    messages: messages,
+  };
+});
diff --git a/src/i18n/routing.ts b/src/i18n/routing.ts
new file mode 100644
index 000000000..9e15ca292
--- /dev/null
+++ b/src/i18n/routing.ts
@@ -0,0 +1,13 @@
+import { createNavigation } from "next-intl/navigation";
+import { defineRouting } from "next-intl/routing";
+
+const locales = ["en", "no", "se"] as const;
+export type Locale = (typeof locales)[number];
+
+export const routing = defineRouting({
+  locales,
+  defaultLocale: "no",
+});
+
+export const { Link, redirect, usePathname, useRouter } =
+  createNavigation(routing);
diff --git a/src/middleware.ts b/src/middleware.ts
index 30125bc40..b215c7f98 100644
--- a/src/middleware.ts
+++ b/src/middleware.ts
@@ -1,9 +1,12 @@
 import { NextRequest } from "next/server";
+import createMiddleware from "next-intl/middleware";
 
+import { routing } from "./i18n/routing";
 import { languageMiddleware } from "./middlewares/languageMiddleware";
 
 export async function middleware(request: NextRequest) {
-  return languageMiddleware(request);
+  await languageMiddleware(request);
+  return createMiddleware(routing)(request);
 }
 
 export const config = {
diff --git a/src/middlewares/languageMiddleware.ts b/src/middlewares/languageMiddleware.ts
index cf32f0369..521c0b67d 100644
--- a/src/middlewares/languageMiddleware.ts
+++ b/src/middlewares/languageMiddleware.ts
@@ -1,6 +1,6 @@
 import Negotiator from "negotiator";
 import { headers } from "next/headers";
-import { NextRequest, NextResponse } from "next/server";
+import { NextRequest } from "next/server";
 import { SanityClient } from "next-sanity";
 
 import { client } from "studio/lib/client";
@@ -203,7 +203,6 @@ function negotiateClientLanguage(
   const acceptLanguage = headers().get("Accept-Language");
   if (acceptLanguage === null) return undefined;
   return new Negotiator({
-    // Negotiator expects lower-case header name
     headers: { "accept-language": acceptLanguage },
   }).language(availableLanguages);
 }
@@ -235,10 +234,9 @@ function negotiateClientLanguage(
  *     they will see the default language version (`/eple`) instead of receiving a 404 error.
  *
  * @param {Object} request - The incoming request object containing URL and user preferences.
+ * @returns {Promise<void>} - No return; modifies `request.nextUrl.pathname` directly.
  */
-export async function languageMiddleware(
-  request: NextRequest,
-): Promise<NextResponse | undefined> {
+export async function languageMiddleware(request: NextRequest): Promise<void> {
   const availableLanguages = await client.fetch<LanguageObject[] | null>(
     LANGUAGES_QUERY,
   );
@@ -246,139 +244,110 @@ export async function languageMiddleware(
     console.error("No languages available, language middleware aborted.");
     return;
   }
+
   const path = request.nextUrl.pathname.replace(/^\//, "").split("/");
   const language = availableLanguages.find(({ id }) => path[0] === id);
   const defaultLanguageId = (
     await client.fetch<LanguageObject | null>(DEFAULT_LANGUAGE_QUERY)
   )?.id;
+
   if (defaultLanguageId === undefined) {
     console.error(
       "No default language available, language middleware aborted.",
     );
     return;
   }
+
   if (language === undefined) {
-    return redirectMissingLanguage(
+    await rewriteMissingLanguage(
+      request,
       path,
       availableLanguages,
       defaultLanguageId,
-      request.url,
     );
+  } else {
+    await rewriteWithLanguage(request, path, language, defaultLanguageId);
   }
-  return redirectWithLanguage(path, language, defaultLanguageId, request.url);
 }
 
 /**
- * Language is provided, check that the path actually exists for the given language.
- * - If it exists, no changes are made.
- * - Otherwise, we attempt to translate to the specified language.
- *   We first check if a translation exists from the default language, before checking other languages.
- *   - If translated, user is redirected to `/[language]/[translatedPath]`
- *   - Otherwise, user is redirected to the path with default language (`/[path]`)
+ * Rewrites the request path to the language-specific version if it exists.
  *
- * @param {string[]} path - The current URL path segments.
- * @param {LanguageObject} language - Language object from URL path
- * @param {string} defaultLanguageId - Language id for the default language
- * @param {string} baseUrl - The base URL of the site.
+ * @param {NextRequest} request - The incoming request.
+ * @param {string[]} path - The path segments of the URL.
+ * @param {LanguageObject} language - The language object based on the detected language code in the URL.
+ * @param {string} defaultLanguageId - The ID of the default language.
+ * @returns {Promise<void>} - No return; modifies `request.nextUrl.pathname` directly.
  */
-async function redirectWithLanguage(
+async function rewriteWithLanguage(
+  request: NextRequest,
   path: string[],
   language: LanguageObject,
   defaultLanguageId: string,
-  baseUrl: string,
-) {
+): Promise<void> {
   const pathWithoutLanguage = path.slice(1);
   let translatedPath = await translatePath(
     pathWithoutLanguage,
     language.id,
     language.id,
   );
+
   if (translatedPath === undefined) {
-    // path does not exist for requested language, try default language
     translatedPath = await translatePath(
       pathWithoutLanguage,
       language.id,
       defaultLanguageId,
     );
   }
+
   if (translatedPath === undefined) {
-    // path does not exist for requested or default language, try other languages
     translatedPath = await translatePath(pathWithoutLanguage, language.id);
   }
-  if (translatedPath === undefined) {
-    return NextResponse.redirect(
-      new URL(`/${pathWithoutLanguage.join("/")}`, baseUrl),
-    );
-  }
-  if (translatedPath.join("/") !== pathWithoutLanguage.join("/")) {
-    return NextResponse.redirect(
-      new URL(`/${language.id}/${translatedPath.join("/")}`, baseUrl),
-    );
+
+  if (translatedPath !== undefined) {
+    const newPath = `/${language.id}/${translatedPath.join("/")}`;
+    if (newPath !== request.nextUrl.pathname) {
+      request.nextUrl.pathname = newPath;
+    }
+  } else {
+    request.nextUrl.pathname = `/${pathWithoutLanguage.join("/")}`;
   }
-  // all good, no modifications needed
-  return;
 }
 
 /**
- * Determines the user's most preferred language from the available languages and handles URL redirection accordingly.
+ * Handles cases where no language is provided in the URL by negotiating the preferred language.
  *
- * Key behaviors:
- * - If the user's preferred (negotiated) language matches the default language, no redirection occurs.
- * - If the user's preferred language is different from the default:
- *   - Attempt to find a translation for the current page.
- *     - If a translated version exists, redirect the user to the corresponding path: `/[negotiatedLanguage]/[translatedPath]`.
- *     - If no translation is found, keep the user on the default language page at `/[path]`.
- *
- * @param {string[]} path - The current URL path segments.
- * @param {string[]} availableLanguages - A list of languages supported by the site.
- * @param {string} defaultLanguageId - Language id for the default language
- * @param {string} baseUrl - The base URL of the site.
+ * @param {NextRequest} request - The incoming request.
+ * @param {string[]} path - The path segments of the URL.
+ * @param {LanguageObject[]} availableLanguages - A list of available languages supported by the site.
+ * @param {string} defaultLanguageId - The ID of the default language.
+ * @returns {Promise<void>} - No return; modifies `request.nextUrl.pathname` directly.
  */
-async function redirectMissingLanguage(
+async function rewriteMissingLanguage(
+  request: NextRequest,
   path: string[],
   availableLanguages: LanguageObject[],
   defaultLanguageId: string,
-  baseUrl: string,
-) {
-  // Pathname does NOT include a language code, we negotiate with the user to find
-  // the most preferred languages from the list of available languages
+): Promise<void> {
   const preferredLanguage =
     negotiateClientLanguage(
       availableLanguages.map((language) => language.id),
     ) ?? defaultLanguageId;
-  // Attempt to translate from default to the preferred language
+
   let translatedPath = await translatePath(
     path,
     preferredLanguage,
     defaultLanguageId,
   );
+
   if (translatedPath === undefined) {
-    // Path not valid for default language, attempt to translate from
-    // a different language to the preferred language
     translatedPath = await translatePath(path, preferredLanguage);
   }
-  const pathString = path.join("/");
-  if (translatedPath === undefined) {
-    // Translation not available, rewrite to default language
-    return NextResponse.rewrite(
-      new URL(`/${defaultLanguageId}/${pathString}`, baseUrl),
-    );
-  }
-  const translatedPathString = translatedPath.join("/");
-  if (preferredLanguage === defaultLanguageId) {
-    if (translatedPathString !== pathString) {
-      // Redirect to translated path, preserving default language
-      return NextResponse.redirect(
-        new URL(`/${translatedPathString}`, baseUrl),
-      );
-    }
-    // Rewrite to include language code for internal routing
-    return NextResponse.rewrite(
-      new URL(`/${defaultLanguageId}/${translatedPathString}`, baseUrl),
-    );
+
+  if (translatedPath !== undefined) {
+    const newPath = `/${preferredLanguage}/${translatedPath.join("/")}`;
+    request.nextUrl.pathname = newPath;
+  } else {
+    request.nextUrl.pathname = `/${defaultLanguageId}/${path.join("/")}`;
   }
-  // Redirect with language code and translated path
-  return NextResponse.redirect(
-    new URL(`/${preferredLanguage}/${translatedPathString}`, baseUrl),
-  );
 }
diff --git a/tsconfig.json b/tsconfig.json
index 93df8a5e2..0a31090af 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -21,6 +21,7 @@
     "target": "ES2017"
   },
   "include": [
+    "next.config.mjs",
     "next-env.d.ts",
     "**/*.ts",
     "**/*.tsx",