diff --git a/components/blocks/InteractiveGermanyMap.tsx b/components/blocks/InteractiveGermanyMap.tsx
index 50bdec2c5..4b0b314f8 100644
--- a/components/blocks/InteractiveGermanyMap.tsx
+++ b/components/blocks/InteractiveGermanyMap.tsx
@@ -150,7 +150,10 @@ export function InteractiveGermanyMap({
                     onMouseEnter={() => setActiveLocation(loc)}
                     onMouseLeave={() => setActiveLocation(null)}
                     onClick={() => {
-                      if (loc.href) router.push(loc.href);
+                      if (loc.href) {
+                        const href = loc.href.startsWith('/') ? `/${locale}${loc.href}` : loc.href;
+                        router.push(href);
+                      }
                     }}
                   >
                     {/* Ping Animation for HQ / Branch */}
diff --git a/components/blocks/JobListingBlock.tsx b/components/blocks/JobListingBlock.tsx
index 95fd61157..d0f1359a7 100644
--- a/components/blocks/JobListingBlock.tsx
+++ b/components/blocks/JobListingBlock.tsx
@@ -59,7 +59,7 @@ export const JobListingBlock = (props: JobListingBlockProps) => {
     ],
     emptyStateMessage = t('emptyStateMessage'),
     emptyStateLinkText = t('emptyStateLinkText'),
-    emptyStateLinkHref = '/kontakt'
+    emptyStateLinkHref = t('emptyStateLinkHref')
   } = props;
   
   const title = props.title || t('title');
diff --git a/components/home/Hero.tsx b/components/home/Hero.tsx
index 7f117db28..57e702481 100644
--- a/components/home/Hero.tsx
+++ b/components/home/Hero.tsx
@@ -160,7 +160,7 @@ export default function Hero({ data }: { data?: any }) {
             <div className="flex flex-col sm:flex-row justify-center md:justify-start gap-4 md:gap-6">
               <div>
                 <Button
-                  href="/contact"
+                  href={`/${locale}/${locale === 'de' ? 'kontakt' : 'contact'}`}
                   variant="white"
                   size="lg"
                   className="group w-full sm:w-auto h-14 md:h-16 px-8 md:px-10 text-base md:text-lg hover:scale-105 transition-all outline-none"
diff --git a/messages/de.json b/messages/de.json
index 2dc50b5db..eef246744 100644
--- a/messages/de.json
+++ b/messages/de.json
@@ -166,12 +166,14 @@
   "CallToAction": {
     "title": "Bereit für Ihr Projekt?",
     "description": "Wir suchen stets nach neuen Herausforderungen und starken Partnern. Kontaktieren Sie uns für eine unverbindliche Beratung zu Ihrem Vorhaben.",
-    "ctaLabel": "Jetzt Kontakt aufnehmen"
+    "ctaLabel": "Jetzt Kontakt aufnehmen",
+    "ctaHref": "/de/kontakt"
   },
   "JobListingBlock": {
     "fairsTitle": "Nächste Messetermine",
     "emptyStateMessage": "Aktuell sind alle Positionen besetzt. Senden Sie uns gerne eine Initiativbewerbung!",
     "emptyStateLinkText": "Jetzt Kontakt aufnehmen",
+    "emptyStateLinkHref": "/de/kontakt",
     "date": "Datum",
     "location": "Location",
     "booth": "Stand",
diff --git a/messages/en.json b/messages/en.json
index 940fc02db..e7ac9adc3 100644
--- a/messages/en.json
+++ b/messages/en.json
@@ -166,12 +166,14 @@
   "CallToAction": {
     "title": "Ready for your project?",
     "description": "We are always looking for new challenges and strong partners. Contact us for a non-binding consultation about your project.",
-    "ctaLabel": "Contact us now"
+    "ctaLabel": "Contact us now",
+    "ctaHref": "/en/contact"
   },
   "JobListingBlock": {
     "fairsTitle": "Upcoming Trade Fairs",
     "emptyStateMessage": "All positions are currently filled. Feel free to send us an unsolicited application!",
     "emptyStateLinkText": "Contact us now",
+    "emptyStateLinkHref": "/en/contact",
     "date": "Date",
     "location": "Location",
     "booth": "Booth",