diff --git a/app/[locale]/layout.tsx b/app/[locale]/layout.tsx
index 8fc9782a4..86f2e9565 100644
--- a/app/[locale]/layout.tsx
+++ b/app/[locale]/layout.tsx
@@ -42,11 +42,11 @@ export async function generateMetadata(props: {
     metadataBase: new URL(baseUrl),
     manifest: '/manifest.webmanifest',
     alternates: {
-      canonical: `${baseUrl}/${locale}`,
+      canonical: `/${locale}`,
       languages: {
-        'de': `${baseUrl}/de`,
-        'en': `${baseUrl}/en`,
-        'x-default': `${baseUrl}/de`,
+        'de': `/de`,
+        'en': `/en`,
+        'x-default': `/de`,
       },
     },
   };
diff --git a/app/[locale]/page.tsx b/app/[locale]/page.tsx
index 56fd15d4f..c17b420c9 100644
--- a/app/[locale]/page.tsx
+++ b/app/[locale]/page.tsx
@@ -13,7 +13,7 @@ const HomeCompetenceBentoGrid = nextDynamic(() => import('@/components/blocks/Co
 const HomeReferencesSlider = nextDynamic(() => import('@/components/blocks/ReferencesSlider').then(mod => mod.ReferencesSlider));
 const FaqBlock = nextDynamic(() => import('@/components/blocks/FaqBlock').then(mod => mod.FaqBlock));
 const CertificatesBlock = nextDynamic(() => import('@/components/blocks/CertificatesBlock').then(mod => mod.CertificatesBlock));
-import { HeroSection } from '@/components/blocks/HeroSection';
+const HeroSection = nextDynamic(() => import('@/components/blocks/HeroSection').then(mod => mod.HeroSection));
 import JsonLd from '@/components/JsonLd';
 
 import { Button } from '@/components/ui/Button';
diff --git a/components/ui/TransitionLink.tsx b/components/ui/TransitionLink.tsx
index 60586f1e6..6610c3f26 100644
--- a/components/ui/TransitionLink.tsx
+++ b/components/ui/TransitionLink.tsx
@@ -37,7 +37,7 @@ export function TransitionLink({ children, href, onClick, transitionMessage, ...
   };
 
   return (
-    <Link href={href} onClick={handleClick} className={cn('cursor-pointer', props.className)} {...props}>
+    <Link href={href} onClick={handleClick} prefetch={props.prefetch ?? false} className={cn('cursor-pointer', props.className)} {...props}>
       {children}
     </Link>
   );