diff --git a/app/[locale]/[slug]/page.tsx b/app/[locale]/[slug]/page.tsx
index 6d54b0a6c..771f14707 100644
--- a/app/[locale]/[slug]/page.tsx
+++ b/app/[locale]/[slug]/page.tsx
@@ -186,7 +186,7 @@ export default async function Page(props: { params: Promise<{ locale: string; sl
     <div className={`flex flex-col min-h-screen ${isFullBleed ? '' : 'bg-white'}`}>
       {/* Generic Hero Section (only for standard pages) */}
       {!isFullBleed && (
-        <section className="bg-primary-dark text-white pt-40 pb-12 md:pt-56 md:pb-16 min-h-[40vh] md:min-h-[45vh] flex flex-col justify-end relative overflow-hidden">
+        <section key={`hero-section-${slug}`} className="bg-primary-dark text-white pt-40 pb-12 md:pt-56 md:pb-16 min-h-[40vh] md:min-h-[45vh] flex flex-col justify-end relative overflow-hidden">
           <div className="absolute inset-0 opacity-20 pointer-events-none">
             <div className="absolute top-0 left-0 w-full h-full bg-[radial-gradient(circle_at_center,_var(--tw-gradient-stops))] from-accent/50 via-transparent to-transparent" />
           </div>
diff --git a/app/[locale]/standorte/[slug]/page.tsx b/app/[locale]/standorte/[slug]/page.tsx
index f02d93df6..936391ee5 100644
--- a/app/[locale]/standorte/[slug]/page.tsx
+++ b/app/[locale]/standorte/[slug]/page.tsx
@@ -65,7 +65,7 @@ export default async function StandortDetail(props: { params: Promise<{ locale:
   return (
     <div className="flex flex-col min-h-screen bg-white">
       {/* Generic Hero Section to match standard pages */}
-      <section className="bg-primary-dark text-white pt-40 pb-12 md:pt-56 md:pb-16 min-h-[40vh] md:min-h-[45vh] flex flex-col justify-end relative overflow-hidden">
+      <section key={`standort-hero-${slug}`} className="bg-primary-dark text-white pt-40 pb-12 md:pt-56 md:pb-16 min-h-[40vh] md:min-h-[45vh] flex flex-col justify-end relative overflow-hidden">
         <div className="absolute inset-0 opacity-20 pointer-events-none">
           <div className="absolute top-0 left-0 w-full h-full bg-[radial-gradient(circle_at_center,_var(--tw-gradient-stops))] from-accent/50 via-transparent to-transparent" />
         </div>
diff --git a/components/blocks/HeroSection.tsx b/components/blocks/HeroSection.tsx
index 796f4d6ca..ffd231a5f 100644
--- a/components/blocks/HeroSection.tsx
+++ b/components/blocks/HeroSection.tsx
@@ -2,6 +2,7 @@
 
 import React from 'react';
 import Image from 'next/image';
+import { usePathname } from 'next/navigation';
 import { motion } from 'framer-motion';
 import { Badge, Container, Heading } from '@/components/ui';
 import { Button } from '@/components/ui/Button';
@@ -39,6 +40,7 @@ const itemVariants = {
 export const HeroSection: React.FC<HeroSectionProps> = (props) => {
   const { title, badge, subtitle, backgroundImage, alignment, ctaLabel, ctaHref } = props;
   const bgSrc = backgroundImage?.sizes?.card?.url || backgroundImage?.url;
+  const pathname = usePathname();
 
   return (
     <section
@@ -46,6 +48,7 @@ export const HeroSection: React.FC<HeroSectionProps> = (props) => {
     >
       {bgSrc && (
         <motion.div 
+          key={`hero-bg-${pathname}`}
           className="absolute inset-0 z-0"
           initial={{ scale: 1.05, opacity: 0 }}
           animate={{ scale: 1, opacity: 1 }}
@@ -75,6 +78,7 @@ export const HeroSection: React.FC<HeroSectionProps> = (props) => {
       )}
       <Container className={`relative z-10 ${alignment === 'center' ? 'max-w-5xl' : ''}`}>
         <motion.div 
+          key={`hero-content-${pathname}`}
           className={`max-w-4xl ${alignment === 'center' ? 'mx-auto' : ''}`}
           variants={containerVariants}
           initial="hidden"
diff --git a/components/blocks/HeroVideo.tsx b/components/blocks/HeroVideo.tsx
index bfb05d20b..a25cabe93 100644
--- a/components/blocks/HeroVideo.tsx
+++ b/components/blocks/HeroVideo.tsx
@@ -4,6 +4,7 @@ import { Button } from '@/components/ui/Button';
 import Image from 'next/image';
 import { motion, AnimatePresence } from 'framer-motion';
 import { useState, useEffect } from 'react';
+import { usePathname } from 'next/navigation';
 
 interface HeroVideoProps {
   data?: any;
@@ -28,6 +29,7 @@ export function HeroVideo(props: HeroVideoProps) {
   const subtitle = props.subtitle || props.description || data?.subtitle || 'Wir verbinden Infrastruktur mit Präzision. Von Horizontalbohrungen bis zu komplexen Leitungsnetzen.';
   const explicitNoVideo = props.videoUrl === 'none' || props.videoUrl === '';
   const videoUrl = explicitNoVideo ? null : (props.videoUrl || data?.videoUrl || '/assets/dummy-hero.mp4');
+  const pathname = usePathname();
 
   const posterSrc = props.backgroundImage?.url || props.posterImage?.url || data?.posterImage?.url || "/assets/photos/DJI_0048.JPG";
   const posterAlt = props.backgroundImage?.alt || data?.posterImage?.alt || "E-TIB Gruppe Baustelle";
@@ -56,7 +58,7 @@ export function HeroVideo(props: HeroVideoProps) {
       
       {videoUrl ? (
         <video
-          key={videoUrl}
+          key={`${pathname}-${videoUrl}`}
           className="absolute inset-0 w-full h-full object-cover z-1 pointer-events-none filter contrast-125 saturate-110 brightness-90"
           src={videoUrl}
           autoPlay
@@ -67,6 +69,7 @@ export function HeroVideo(props: HeroVideoProps) {
         />
       ) : (
         <Image
+          key={`img-${pathname}-${posterSrc}`}
           src={posterSrc}
           alt={posterAlt}
           fill
@@ -88,6 +91,7 @@ export function HeroVideo(props: HeroVideoProps) {
       
       <div className="container relative z-[4] text-center px-4">
         <motion.div
+          key={`hero-content-${pathname}`}
           initial={{ opacity: 0, y: 40 }}
           animate={{ opacity: 1, y: 0 }}
           transition={{ duration: 1.2, ease: [0.16, 1, 0.3, 1] }}
diff --git a/components/blocks/InteractiveGermanyMap.tsx b/components/blocks/InteractiveGermanyMap.tsx
index 3d993f49d..e8f772238 100644
--- a/components/blocks/InteractiveGermanyMap.tsx
+++ b/components/blocks/InteractiveGermanyMap.tsx
@@ -4,7 +4,7 @@ import React, { useState } from 'react';
 import { motion, AnimatePresence } from 'framer-motion';
 import { MapPin, Factory, Zap, CheckCircle2, ArrowUpRight } from 'lucide-react';
 import Image from 'next/image';
-import { useRouter } from 'next/navigation';
+import { useRouter, usePathname } from 'next/navigation';
 import Link from 'next/link';
 import { AnimatedGlossyBorder } from '@/components/ui/AnimatedGlossyBorder';
 import { Location, defaultLocations, minorLocations, projectLocations } from '@/lib/map-data';
@@ -37,6 +37,7 @@ export function InteractiveGermanyMap({
 }: InteractiveGermanyMapProps) {
   const [activeLocation, setActiveLocation] = useState<Location | null>(null);
   const router = useRouter();
+  const pathname = usePathname();
   const locale = useLocale();
   const t = useTranslations('InteractiveGermanyMap');
   const tStandard = useTranslations('StandardPage');
@@ -57,7 +58,7 @@ export function InteractiveGermanyMap({
   const minorNodes = locations.filter((l) => l.type === 'minor_node');
 
   return (
-    <div className={isHero ? "relative w-full" : "relative w-full max-w-7xl mx-auto py-16 md:py-24 px-4 sm:px-6 mt-16 md:mt-20"}>
+    <div key={isHero ? `hero-map-${pathname}` : undefined} className={isHero ? "relative w-full" : "relative w-full max-w-7xl mx-auto py-16 md:py-24 px-4 sm:px-6 mt-16 md:mt-20"}>
       <div className={`bg-[#050B14] ${isHero ? 'pt-32 pb-16 md:pt-40 md:pb-24' : 'rounded-[2.5rem] md:rounded-[3.5rem] shadow-2xl border border-white/5'} overflow-visible relative group/map`}>
         {/* Animated Border Glow */}
         {!isHero && <AnimatedGlossyBorder opacity={0.7} className="z-30" />}
diff --git a/components/home/Hero.tsx b/components/home/Hero.tsx
index 7421a64ac..27aab976a 100644
--- a/components/home/Hero.tsx
+++ b/components/home/Hero.tsx
@@ -8,6 +8,7 @@ import { useAnalytics } from '../analytics/useAnalytics';
 import { AnalyticsEvents } from '../analytics/analytics-events';
 import { useState, useEffect, useRef, useCallback } from 'react';
 import { ChevronRight } from 'lucide-react';
+import { usePathname } from 'next/navigation';
 import { AISearchResults } from '../search/AISearchResults';
 const HeroIllustration = dynamic(() => import('./HeroIllustration'), { ssr: false });
 const AIOrb = dynamic(() => import('../search/AIOrb'), { ssr: false });
@@ -15,6 +16,7 @@ const AIOrb = dynamic(() => import('../search/AIOrb'), { ssr: false });
 export default function Hero({ data }: { data?: any }) {
   const t = useTranslations('Home.hero');
   const locale = useLocale();
+  const pathname = usePathname();
   const { trackEvent } = useAnalytics();
 
   const [searchQuery, setSearchQuery] = useState('');
@@ -85,7 +87,7 @@ export default function Hero({ data }: { data?: any }) {
 
   return (
     <>
-      <Section className="relative min-h-[85vh] md:h-[90vh] flex flex-col items-center justify-center overflow-hidden bg-primary py-12 md:py-0 lg:py-0">
+      <Section key={`home-hero-${pathname}`} className="relative min-h-[85vh] md:h-[90vh] flex flex-col items-center justify-center overflow-hidden bg-primary py-12 md:py-0 lg:py-0">
         <Container className="relative z-10 text-center md:text-left text-white w-full order-2 md:order-none">
           <div className="max-w-5xl mx-auto md:mx-0">
             <div>