diff --git a/src/App.tsx b/src/App.tsx
index 5d06118..bd93899 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -42,6 +42,10 @@ import {
   getHashTarget,
   userPrefersReducedMotion,
 } from "./lib/navigationFocus";
+import {
+  isLocaleSwitchNavigationState,
+  restoreLocaleScrollContext,
+} from "./lib/localeScroll";
 
 const PortfolioPage = lazy(() => import("./pages/PortfolioPage"));
 const LemBoxCasePage = lazy(() => import("./pages/LemBoxCasePage"));
@@ -181,6 +185,7 @@ function NavigationFocusManager({ isNotFound }: { isNotFound: boolean }) {
     };
 
     if (location.hash === "") {
+      if (isLocaleSwitchNavigationState(location.state)) return;
       focusElement(main);
       scrollMainToTop();
       return;
@@ -225,7 +230,39 @@ function NavigationFocusManager({ isNotFound }: { isNotFound: boolean }) {
       observer.disconnect();
       window.clearTimeout(timeoutId);
     };
-  }, [isNotFound, location.hash, location.pathname, navigationType]);
+  }, [isNotFound, location.hash, location.pathname, location.state, navigationType]);
+
+  return null;
+}
+
+function LocaleSwitchScrollRestoration() {
+  const location = useLocation();
+  const navigationType = useNavigationType();
+  const frameIds = useRef<number[]>([]);
+
+  useEffect(() => {
+    frameIds.current.forEach((id) => window.cancelAnimationFrame(id));
+    frameIds.current = [];
+
+    if (navigationType === "POP") return;
+    if (location.hash !== "") return;
+    if (!isLocaleSwitchNavigationState(location.state)) return;
+
+    const { scrollContext } = location.state;
+
+    const firstFrame = window.requestAnimationFrame(() => {
+      const secondFrame = window.requestAnimationFrame(() => {
+        restoreLocaleScrollContext(scrollContext);
+      });
+      frameIds.current.push(secondFrame);
+    });
+    frameIds.current.push(firstFrame);
+
+    return () => {
+      frameIds.current.forEach((id) => window.cancelAnimationFrame(id));
+      frameIds.current = [];
+    };
+  }, [location.hash, location.key, location.state, navigationType]);
 
   return null;
 }
@@ -317,6 +354,7 @@ function App({
           </main>
 
           <NavigationFocusManager isNotFound={isNotFound} />
+          <LocaleSwitchScrollRestoration />
 
           <Footer />
         </div>
diff --git a/src/Components/Navbar.tsx b/src/Components/Navbar.tsx
index 20feda0..f00e56b 100644
--- a/src/Components/Navbar.tsx
+++ b/src/Components/Navbar.tsx
@@ -1,6 +1,12 @@
 // src/Components/Navbar.tsx
 
-import { useState, useEffect, useRef } from "react";
+import {
+  useCallback,
+  useState,
+  useEffect,
+  useRef,
+  type MouseEvent as ReactMouseEvent,
+} from "react";
 import translations from "../i18n";
 import { useLanguage } from "../i18n/useLanguage";
 import { FaBars, FaTimes } from "react-icons/fa";
@@ -11,6 +17,7 @@ import {
   getLocalizedPath,
 } from "../routes/siteRoutes";
 import type { Language } from "../i18n/language";
+import { userPrefersReducedMotion } from "../lib/navigationFocus";
 
 const MOBILE_NAVIGATION_ID = "mobile-navigation-panel";
 
@@ -86,6 +93,37 @@ export default function Navbar() {
     menuTriggerRef.current?.focus();
   };
 
+  const handleBrandClick = useCallback(
+    (event: ReactMouseEvent<HTMLAnchorElement>) => {
+      setMenuOpen(false);
+
+      const isModifiedClick =
+        event.button !== 0 ||
+        event.metaKey ||
+        event.ctrlKey ||
+        event.shiftKey ||
+        event.altKey;
+      if (isModifiedClick) return;
+
+      const isAlreadyCleanHome =
+        location.pathname === homePath &&
+        location.search === "" &&
+        location.hash === "";
+      if (!isAlreadyCleanHome) return;
+
+      // Already at the target Home: there is no pathname/hash change for
+      // NavigationFocusManager to react to, so scroll here directly instead
+      // of letting Link push a redundant history entry to the same URL.
+      event.preventDefault();
+      window.scrollTo({
+        behavior: userPrefersReducedMotion() ? "auto" : "smooth",
+        left: 0,
+        top: 0,
+      });
+    },
+    [homePath, location.hash, location.pathname, location.search],
+  );
+
   useEffect(() => {
     if (!menuOpen) return;
 
@@ -109,6 +147,7 @@ export default function Navbar() {
         {/* Nombre (link to Home) */}
         <Link
           to={homePath}
+          onClick={handleBrandClick}
           className="text-lg font-medium text-white tracking-normal leading-snug hover:opacity-80 transition focus:outline-none focus-visible:ring-2 focus-visible:ring-white focus-visible:ring-offset-2 focus-visible:ring-offset-black rounded"
           aria-label={language === "es" ? "DEVRODRI - Inicio" : "DEVRODRI - Home"}
         >
diff --git a/src/Components/SeoHead.tsx b/src/Components/SeoHead.tsx
index 5a46df0..203cda3 100644
--- a/src/Components/SeoHead.tsx
+++ b/src/Components/SeoHead.tsx
@@ -18,7 +18,7 @@ export default function SeoHead() {
     : null;
 
   return (
-    <Helmet>
+    <Helmet defer={false}>
       <html lang={locale} />
       <title>{metadata.title}</title>
       <meta name="description" content={metadata.description} />
diff --git a/src/i18n/LanguageProvider.tsx b/src/i18n/LanguageProvider.tsx
index ee1daf1..725b590 100644
--- a/src/i18n/LanguageProvider.tsx
+++ b/src/i18n/LanguageProvider.tsx
@@ -11,7 +11,9 @@ import { LanguageContext } from "./languageContext";
 import {
   getEquivalentLocalePath,
   getLocaleForPathname,
+  getPublicRoute,
 } from "../routes/siteRoutes";
+import { captureLocaleScrollContext } from "../lib/localeScroll";
 
 function detectBrowserLanguage(): Language {
   if (typeof navigator === "undefined") return "es";
@@ -83,10 +85,15 @@ export function RoutedLanguageProvider({ children }: { children: ReactNode }) {
   const language = getLocaleForPathname(location.pathname);
 
   const handleLanguageChange = useCallback((nextLanguage: Language) => {
+    const currentPage = getPublicRoute(location.pathname)?.page ?? null;
+    const scrollContext = captureLocaleScrollContext(currentPage);
+
     navigate({
       pathname: getEquivalentLocalePath(location.pathname, nextLanguage),
       search: location.search,
       hash: location.hash,
+    }, {
+      state: { localeSwitch: true, scrollContext },
     });
   }, [location.hash, location.pathname, location.search, navigate]);
 
diff --git a/src/lib/localeScroll.ts b/src/lib/localeScroll.ts
new file mode 100644
index 0000000..3ad2627
--- /dev/null
+++ b/src/lib/localeScroll.ts
@@ -0,0 +1,157 @@
+import type { PageKey } from "../routes/siteRoutes";
+
+export type LocaleScrollContext = {
+  pageRatio: number;
+  sectionKey: string | null;
+  sectionProgress: number | null;
+  topAnchor: boolean;
+};
+
+export type LocaleSwitchNavigationState = {
+  localeSwitch: true;
+  scrollContext: LocaleScrollContext;
+};
+
+const TOP_ANCHOR_THRESHOLD_PX = 48;
+
+const SECTION_KEYS_BY_PAGE: Record<PageKey, readonly string[]> = {
+  home: ["hero", "sobremi", "portfolio", "contacto", "faq"],
+  portfolio: [],
+  "lem-box": [
+    "lem-box-summary",
+    "lem-box-challenge",
+    "lem-box-role",
+    "lem-box-ecosystem",
+    "lem-box-audiences",
+    "lem-box-solution",
+    "lem-box-architecture",
+    "lem-box-markets",
+    "lem-box-evolution",
+    "lem-box-mobile-future",
+    "lem-box-public-links",
+    "lem-box-final-cta",
+  ],
+  services: [
+    "services-choose",
+    "services-directory",
+    "services-method",
+    "services-coverage",
+    "services-proof",
+    "services-cta",
+  ],
+  "business-websites": [
+    "business-websites-deliverables",
+    "business-websites-cases",
+    "business-websites-method",
+    "business-websites-crosslink",
+    "business-websites-coverage",
+    "business-websites-cta",
+  ],
+  "custom-software": [
+    "custom-software-scope",
+    "custom-software-proof",
+    "custom-software-method",
+    "custom-software-crosslink",
+    "custom-software-coverage",
+    "custom-software-cta",
+  ],
+  "thank-you": [],
+};
+
+function clamp(value: number, min: number, max: number): number {
+  return Math.min(max, Math.max(min, value));
+}
+
+function getNavbarHeight(): number {
+  const navbar = document.querySelector<HTMLElement>("[data-nojs-navbar]");
+  return navbar?.getBoundingClientRect().height ?? 0;
+}
+
+function getViewportCenter(navbarHeight: number): number {
+  return navbarHeight + (window.innerHeight - navbarHeight) / 2;
+}
+
+function getPageRatio(): number {
+  const scrollable = document.documentElement.scrollHeight - window.innerHeight;
+  if (scrollable <= 0) return 0;
+  return clamp(window.scrollY / scrollable, 0, 1);
+}
+
+export function captureLocaleScrollContext(
+  page: PageKey | null,
+): LocaleScrollContext {
+  const navbarHeight = getNavbarHeight();
+  const pageRatio = getPageRatio();
+
+  if (window.scrollY <= navbarHeight + TOP_ANCHOR_THRESHOLD_PX) {
+    return { pageRatio, sectionKey: null, sectionProgress: null, topAnchor: true };
+  }
+
+  const sectionKeys = page === null ? [] : SECTION_KEYS_BY_PAGE[page];
+  const viewportCenter = getViewportCenter(navbarHeight);
+
+  let bestKey: string | null = null;
+  let bestProgress: number | null = null;
+  let bestDistance = Infinity;
+
+  for (const key of sectionKeys) {
+    const el = document.getElementById(key);
+    if (el === null) continue;
+    const rect = el.getBoundingClientRect();
+    if (rect.height <= 0) continue;
+
+    const distance =
+      viewportCenter < rect.top
+        ? rect.top - viewportCenter
+        : viewportCenter > rect.bottom
+          ? viewportCenter - rect.bottom
+          : 0;
+
+    if (distance < bestDistance) {
+      bestDistance = distance;
+      bestKey = key;
+      bestProgress = clamp((viewportCenter - rect.top) / rect.height, 0, 1);
+    }
+    if (distance === 0) break;
+  }
+
+  return {
+    pageRatio,
+    sectionKey: bestKey,
+    sectionProgress: bestProgress,
+    topAnchor: false,
+  };
+}
+
+export function isLocaleSwitchNavigationState(
+  state: unknown,
+): state is LocaleSwitchNavigationState {
+  if (typeof state !== "object" || state === null) return false;
+  const candidate = state as Record<string, unknown>;
+  if (candidate.localeSwitch !== true) return false;
+  const scrollContext = candidate.scrollContext;
+  return typeof scrollContext === "object" && scrollContext !== null;
+}
+
+export function restoreLocaleScrollContext(context: LocaleScrollContext): void {
+  if (context.topAnchor) return;
+
+  const navbarHeight = getNavbarHeight();
+
+  if (context.sectionKey !== null && context.sectionProgress !== null) {
+    const el = document.getElementById(context.sectionKey);
+    if (el !== null) {
+      const rect = el.getBoundingClientRect();
+      const viewportCenter = getViewportCenter(navbarHeight);
+      const targetElementY = rect.top + context.sectionProgress * rect.height;
+      const delta = targetElementY - viewportCenter;
+      window.scrollTo({ left: 0, top: window.scrollY + delta });
+      return;
+    }
+  }
+
+  const scrollable = document.documentElement.scrollHeight - window.innerHeight;
+  if (scrollable > 0) {
+    window.scrollTo({ left: 0, top: context.pageRatio * scrollable });
+  }
+}
diff --git a/src/test/BrandNavigation.test.tsx b/src/test/BrandNavigation.test.tsx
new file mode 100644
index 0000000..8961417
--- /dev/null
+++ b/src/test/BrandNavigation.test.tsx
@@ -0,0 +1,419 @@
+import { render, screen, waitFor, within } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { MemoryRouter, useLocation, useNavigate } from "react-router-dom";
+import App from "../App";
+import { RoutedLanguageProvider } from "../i18n/LanguageProvider";
+import { isLocaleSwitchNavigationState } from "../lib/localeScroll";
+
+function LocationProbe() {
+  const location = useLocation();
+  return (
+    <output data-testid="loc">
+      {location.pathname}
+      {location.search}
+      {location.hash}|{location.key}|{JSON.stringify(location.state)}
+    </output>
+  );
+}
+
+function GoBackButton() {
+  const navigate = useNavigate();
+  return (
+    <button type="button" onClick={() => navigate(-1)}>
+      test-go-back
+    </button>
+  );
+}
+
+function renderApp(entry: string, { withGoBack = false } = {}) {
+  return render(
+    <MemoryRouter initialEntries={[entry]}>
+      <RoutedLanguageProvider>
+        <App />
+        <LocationProbe />
+        {withGoBack ? <GoBackButton /> : null}
+      </RoutedLanguageProvider>
+    </MemoryRouter>,
+  );
+}
+
+function getScrollToSpy() {
+  const spy = window.scrollTo as unknown as ReturnType<typeof vi.fn>;
+  spy.mockClear();
+  return spy;
+}
+
+describe("brand navigation — DevRodri link", () => {
+  beforeEach(() => {
+    localStorage.setItem("language", "es");
+  });
+
+  afterEach(() => {
+    vi.restoreAllMocks();
+  });
+
+  it("1. points to / in Spanish", async () => {
+    renderApp("/portfolio");
+    const brand = await screen.findByRole("link", { name: "DEVRODRI - Inicio" });
+    expect(brand.tagName).toBe("A");
+    expect(brand).toHaveAttribute("href", "/");
+  });
+
+  it("2. points to /en in English", async () => {
+    renderApp("/en/portfolio");
+    const brand = await screen.findByRole("link", { name: "DEVRODRI - Home" });
+    expect(brand.tagName).toBe("A");
+    expect(brand).toHaveAttribute("href", "/en");
+  });
+
+  it("3. clicking from a scrolled Home scrolls back to top without navigating", async () => {
+    const scrollToSpy = getScrollToSpy();
+    const user = userEvent.setup();
+    renderApp("/");
+    await screen.findByRole("heading", {
+      level: 1,
+      name: "Sitios web que comunican y convierten.",
+    });
+    const locBefore = screen.getByTestId("loc").textContent;
+    scrollToSpy.mockClear();
+
+    await user.click(screen.getByRole("link", { name: "DEVRODRI - Inicio" }));
+
+    await waitFor(() => {
+      expect(scrollToSpy).toHaveBeenCalledWith(
+        expect.objectContaining({ left: 0, top: 0 }),
+      );
+    });
+    expect(screen.getByTestId("loc").textContent).toBe(locBefore);
+  });
+
+  it("4. clicking from another route navigates to Home and scrolls to top", async () => {
+    const scrollToSpy = getScrollToSpy();
+    const user = userEvent.setup();
+    renderApp("/portfolio");
+    await screen.findByRole("heading", { level: 1, name: "Algunos trabajos" });
+    scrollToSpy.mockClear();
+
+    await user.click(screen.getByRole("link", { name: "DEVRODRI - Inicio" }));
+
+    await screen.findByRole("heading", {
+      level: 1,
+      name: "Sitios web que comunican y convierten.",
+    });
+    expect(screen.getByTestId("loc").textContent).toMatch(/^\/\|/);
+    await waitFor(() => {
+      expect(scrollToSpy).toHaveBeenCalledWith(
+        expect.objectContaining({ left: 0, top: 0 }),
+      );
+    });
+  });
+
+  it("5. clicking from an English route keeps English and lands on /en", async () => {
+    const user = userEvent.setup();
+    renderApp("/en/services");
+    await screen.findByRole("heading", {
+      level: 1,
+      name: "Websites, custom systems, and automation for businesses.",
+    });
+
+    await user.click(screen.getByRole("link", { name: "DEVRODRI - Home" }));
+
+    await screen.findByRole("heading", {
+      level: 1,
+      name: "Websites built to communicate and convert.",
+    });
+    expect(screen.getByTestId("loc").textContent).toMatch(/^\/en\|/);
+  });
+
+  it("6. drops query and hash from another route when landing on Home", async () => {
+    const user = userEvent.setup();
+    renderApp("/servicios?ref=campaign#services-directory");
+    await screen.findByRole("heading", {
+      level: 1,
+      name: "Sitios web, sistemas y automatización para empresas.",
+    });
+
+    await user.click(screen.getByRole("link", { name: "DEVRODRI - Inicio" }));
+
+    await screen.findByRole("heading", {
+      level: 1,
+      name: "Sitios web que comunican y convierten.",
+    });
+    expect(screen.getByTestId("loc").textContent).toMatch(/^\/\|/);
+  });
+
+  it("7. does not create a duplicate history entry from the same clean Home", async () => {
+    const user = userEvent.setup();
+    renderApp("/");
+    await screen.findByRole("heading", {
+      level: 1,
+      name: "Sitios web que comunican y convierten.",
+    });
+    const keyBefore = screen.getByTestId("loc").textContent?.split("|")[1];
+
+    await user.click(screen.getByRole("link", { name: "DEVRODRI - Inicio" }));
+
+    const keyAfter = screen.getByTestId("loc").textContent?.split("|")[1];
+    expect(keyAfter).toBe(keyBefore);
+  });
+
+  it("8. does not re-trigger a pathname transition from the same clean Home (no duplicate pageview)", async () => {
+    const user = userEvent.setup();
+    renderApp("/");
+    await screen.findByRole("heading", {
+      level: 1,
+      name: "Sitios web que comunican y convierten.",
+    });
+    const pathnameBefore = screen.getByTestId("loc").textContent?.split("|")[0];
+
+    await user.click(screen.getByRole("link", { name: "DEVRODRI - Inicio" }));
+    await new Promise((resolve) => setTimeout(resolve, 20));
+
+    const pathnameAfter = screen.getByTestId("loc").textContent?.split("|")[0];
+    expect(pathnameAfter).toBe(pathnameBefore);
+  });
+
+  it("9. produces exactly one pathname transition when navigating from another route", async () => {
+    const user = userEvent.setup();
+    renderApp("/portfolio");
+    await screen.findByRole("heading", { level: 1, name: "Algunos trabajos" });
+
+    await user.click(screen.getByRole("link", { name: "DEVRODRI - Inicio" }));
+
+    await screen.findByRole("heading", {
+      level: 1,
+      name: "Sitios web que comunican y convierten.",
+    });
+    expect(screen.getByTestId("loc").textContent).toMatch(/^\/\|/);
+  });
+
+  it("10. closes the mobile menu on a brand click", async () => {
+    const user = userEvent.setup();
+    renderApp("/");
+    await screen.findByRole("heading", {
+      level: 1,
+      name: "Sitios web que comunican y convierten.",
+    });
+
+    await user.click(screen.getByRole("button", { name: "Abrir menú" }));
+    expect(document.getElementById("mobile-navigation-panel")).not.toBeNull();
+
+    await user.click(screen.getByRole("link", { name: "DEVRODRI - Inicio" }));
+
+    await waitFor(() => {
+      expect(document.getElementById("mobile-navigation-panel")).toBeNull();
+    });
+  });
+
+  it("11. never marks a brand navigation as a locale switch", async () => {
+    const user = userEvent.setup();
+    renderApp("/portfolio");
+    await screen.findByRole("heading", { level: 1, name: "Algunos trabajos" });
+
+    await user.click(screen.getByRole("link", { name: "DEVRODRI - Inicio" }));
+
+    await screen.findByRole("heading", {
+      level: 1,
+      name: "Sitios web que comunican y convierten.",
+    });
+    const stateJson = screen.getByTestId("loc").textContent?.split("|")[2];
+    expect(isLocaleSwitchNavigationState(JSON.parse(stateJson ?? "null"))).toBe(
+      false,
+    );
+  });
+
+  it("12. a pending locale-switch scroll snapshot is not consumed by a following brand click", async () => {
+    const scrollToSpy = getScrollToSpy();
+    const user = userEvent.setup();
+    renderApp("/portfolio");
+    await screen.findByRole("heading", { level: 1, name: "Algunos trabajos" });
+
+    await user.click(screen.getByRole("button", { name: "Cambiar a inglés" }));
+    await screen.findByRole("heading", { level: 1, name: "Some Work" });
+    scrollToSpy.mockClear();
+
+    await user.click(screen.getByRole("link", { name: "DEVRODRI - Home" }));
+
+    await screen.findByRole("heading", {
+      level: 1,
+      name: "Websites built to communicate and convert.",
+    });
+    await waitFor(() => {
+      expect(scrollToSpy).toHaveBeenCalledWith(
+        expect.objectContaining({ left: 0, top: 0 }),
+      );
+    });
+  });
+
+  it("14. still preserves the FAQ section across a locale switch", async () => {
+    vi.spyOn(HTMLElement.prototype, "getBoundingClientRect").mockImplementation(
+      function (this: HTMLElement) {
+        const empty = {
+          bottom: 0, height: 0, left: 0, right: 0, top: 0, width: 0, x: 0, y: 0,
+          toJSON: () => ({}),
+        } as DOMRect;
+        if (this.matches("[data-nojs-navbar]")) {
+          return { ...empty, bottom: 60, height: 60 };
+        }
+        if (this.id === "faq") {
+          return { ...empty, bottom: 2400, height: 400, top: 2000 };
+        }
+        return empty;
+      },
+    );
+    Object.defineProperty(window, "innerHeight", { configurable: true, value: 800 });
+    Object.defineProperty(window, "scrollY", { configurable: true, value: 2100 });
+
+    const scrollToSpy = getScrollToSpy();
+    const user = userEvent.setup();
+    renderApp("/");
+    await screen.findByRole("heading", {
+      level: 1,
+      name: "Sitios web que comunican y convierten.",
+    });
+
+    await user.click(screen.getByRole("button", { name: "Cambiar a inglés" }));
+    await screen.findByRole("heading", {
+      level: 1,
+      name: "Websites built to communicate and convert.",
+    });
+
+    await waitFor(() => {
+      const topCalls = scrollToSpy.mock.calls.filter(
+        (call) => (call[0] as ScrollToOptions)?.top === 0,
+      );
+      expect(topCalls).toHaveLength(0);
+    });
+  });
+
+  it("15. still preserves the Services hub section across a locale switch", async () => {
+    vi.spyOn(HTMLElement.prototype, "getBoundingClientRect").mockImplementation(
+      function (this: HTMLElement) {
+        const empty = {
+          bottom: 0, height: 0, left: 0, right: 0, top: 0, width: 0, x: 0, y: 0,
+          toJSON: () => ({}),
+        } as DOMRect;
+        if (this.matches("[data-nojs-navbar]")) {
+          return { ...empty, bottom: 60, height: 60 };
+        }
+        if (this.id === "services-coverage") {
+          return { ...empty, bottom: 2400, height: 400, top: 2000 };
+        }
+        return empty;
+      },
+    );
+    Object.defineProperty(window, "innerHeight", { configurable: true, value: 800 });
+    Object.defineProperty(window, "scrollY", { configurable: true, value: 2100 });
+
+    const scrollToSpy = getScrollToSpy();
+    const user = userEvent.setup();
+    renderApp("/servicios");
+    await screen.findByRole("heading", {
+      level: 1,
+      name: "Sitios web, sistemas y automatización para empresas.",
+    });
+
+    await user.click(screen.getByRole("button", { name: "Cambiar a inglés" }));
+    await screen.findByRole("heading", {
+      level: 1,
+      name: "Websites, custom systems, and automation for businesses.",
+    });
+
+    await waitFor(() => {
+      const topCalls = scrollToSpy.mock.calls.filter(
+        (call) => (call[0] as ScrollToOptions)?.top === 0,
+      );
+      expect(topCalls).toHaveLength(0);
+    });
+  });
+
+  it("16. still preserves the LEM-BOX ecosystem section across a locale switch", async () => {
+    vi.spyOn(HTMLElement.prototype, "getBoundingClientRect").mockImplementation(
+      function (this: HTMLElement) {
+        const empty = {
+          bottom: 0, height: 0, left: 0, right: 0, top: 0, width: 0, x: 0, y: 0,
+          toJSON: () => ({}),
+        } as DOMRect;
+        if (this.matches("[data-nojs-navbar]")) {
+          return { ...empty, bottom: 60, height: 60 };
+        }
+        if (this.id === "lem-box-ecosystem") {
+          return { ...empty, bottom: 2400, height: 400, top: 2000 };
+        }
+        return empty;
+      },
+    );
+    Object.defineProperty(window, "innerHeight", { configurable: true, value: 800 });
+    Object.defineProperty(window, "scrollY", { configurable: true, value: 2100 });
+
+    const scrollToSpy = getScrollToSpy();
+    const user = userEvent.setup();
+    renderApp("/portfolio/lem-box");
+    await screen.findByRole("heading", { level: 1, name: "LEM-BOX" });
+
+    await user.click(screen.getByRole("button", { name: "Cambiar a inglés" }));
+    await screen.findByRole("heading", { level: 1, name: "LEM-BOX" });
+
+    await waitFor(() => {
+      const topCalls = scrollToSpy.mock.calls.filter(
+        (call) => (call[0] as ScrollToOptions)?.top === 0,
+      );
+      expect(topCalls).toHaveLength(0);
+    });
+  });
+
+  it("17. a normal Navbar navigation still scrolls to top", async () => {
+    const scrollToSpy = getScrollToSpy();
+    const user = userEvent.setup();
+    renderApp("/");
+    await screen.findByRole("heading", {
+      level: 1,
+      name: "Sitios web que comunican y convierten.",
+    });
+    scrollToSpy.mockClear();
+
+    const desktopNavigation = document.querySelector<HTMLElement>(
+      "[data-navbar-desktop]",
+    );
+    if (desktopNavigation === null) throw new Error("Missing desktop Navbar");
+    await user.click(within(desktopNavigation).getByRole("link", { name: "Portfolio" }));
+    await screen.findByRole("heading", { level: 1, name: "Algunos trabajos" });
+
+    await waitFor(() => {
+      expect(scrollToSpy).toHaveBeenCalledWith(
+        expect.objectContaining({ left: 0, top: 0 }),
+      );
+    });
+  });
+
+  it("18. keeps the brand link a real anchor for no-JS navigation", async () => {
+    renderApp("/portfolio");
+    const brand = await screen.findByRole("link", { name: "DEVRODRI - Inicio" });
+    expect(brand.tagName).toBe("A");
+    expect(brand).toHaveAttribute("href", "/");
+    expect(brand.closest("a")).toBe(brand);
+    expect(brand.querySelector("a")).toBeNull();
+  });
+
+  it("19. does not replay a stale scroll restoration on Back navigation", async () => {
+    const scrollToSpy = getScrollToSpy();
+    const user = userEvent.setup();
+    renderApp("/portfolio", { withGoBack: true });
+    await screen.findByRole("heading", { level: 1, name: "Algunos trabajos" });
+
+    await user.click(screen.getByRole("link", { name: "DEVRODRI - Inicio" }));
+    await screen.findByRole("heading", {
+      level: 1,
+      name: "Sitios web que comunican y convierten.",
+    });
+    scrollToSpy.mockClear();
+
+    await user.click(screen.getByRole("button", { name: "test-go-back" }));
+
+    await new Promise((resolve) => setTimeout(resolve, 20));
+    expect(
+      scrollToSpy.mock.calls.some((call) => (call[0] as ScrollToOptions)?.top === 0),
+    ).toBe(false);
+  });
+});
diff --git a/src/test/LocaleScrollRestoration.test.tsx b/src/test/LocaleScrollRestoration.test.tsx
new file mode 100644
index 0000000..2c76599
--- /dev/null
+++ b/src/test/LocaleScrollRestoration.test.tsx
@@ -0,0 +1,405 @@
+import { render, screen, waitFor, within } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { MemoryRouter } from "react-router-dom";
+import App from "../App";
+import { RoutedLanguageProvider } from "../i18n/LanguageProvider";
+import {
+  captureLocaleScrollContext,
+  isLocaleSwitchNavigationState,
+  restoreLocaleScrollContext,
+} from "../lib/localeScroll";
+
+type SectionRect = { top: number; height: number };
+
+type GeometryOptions = {
+  sections?: Record<string, SectionRect>;
+  navbarHeight?: number;
+  innerHeight?: number;
+  scrollY?: number;
+  scrollHeight?: number;
+};
+
+function mockGeometry({
+  sections = {},
+  navbarHeight = 60,
+  innerHeight = 800,
+  scrollY = 0,
+  scrollHeight = 5000,
+}: GeometryOptions) {
+  Object.defineProperty(window, "innerHeight", {
+    configurable: true,
+    value: innerHeight,
+  });
+  Object.defineProperty(window, "scrollY", {
+    configurable: true,
+    value: scrollY,
+  });
+  Object.defineProperty(document.documentElement, "scrollHeight", {
+    configurable: true,
+    value: scrollHeight,
+  });
+
+  vi.spyOn(HTMLElement.prototype, "getBoundingClientRect").mockImplementation(
+    function (this: HTMLElement) {
+      const empty: DOMRect = {
+        bottom: 0,
+        height: 0,
+        left: 0,
+        right: 0,
+        top: 0,
+        width: 0,
+        x: 0,
+        y: 0,
+        toJSON: () => ({}),
+      };
+
+      if (this.matches("[data-nojs-navbar]")) {
+        return { ...empty, bottom: navbarHeight, height: navbarHeight };
+      }
+      const section = this.id ? sections[this.id] : undefined;
+      if (section !== undefined) {
+        return {
+          ...empty,
+          bottom: section.top + section.height,
+          height: section.height,
+          top: section.top,
+        };
+      }
+      return empty;
+    },
+  );
+}
+
+/** Standalone unit tests exercise localeScroll.ts against a bare document, so
+ * the navbar and section ids it queries for must exist first. */
+function mockGeometryWithFixture(options: GeometryOptions) {
+  const fixture = document.createElement("div");
+  fixture.setAttribute("data-locale-scroll-fixture", "true");
+
+  const navbar = document.createElement("nav");
+  navbar.setAttribute("data-nojs-navbar", "true");
+  fixture.appendChild(navbar);
+
+  for (const id of Object.keys(options.sections ?? {})) {
+    const section = document.createElement("div");
+    section.id = id;
+    fixture.appendChild(section);
+  }
+
+  document.body.appendChild(fixture);
+  mockGeometry(options);
+}
+
+/** window.scrollTo is a single shared vi.fn() installed once in test/setup.ts;
+ * vi.spyOn returns that same instance instead of wrapping it, so its call
+ * history must be cleared explicitly before each assertion, not restored. */
+function getScrollToSpy() {
+  const spy = window.scrollTo as unknown as ReturnType<typeof vi.fn>;
+  spy.mockClear();
+  return spy;
+}
+
+function renderApp(entry: string) {
+  return render(
+    <MemoryRouter initialEntries={[entry]}>
+      <RoutedLanguageProvider>
+        <App />
+      </RoutedLanguageProvider>
+    </MemoryRouter>,
+  );
+}
+
+describe("localeScroll — capture/restore contract", () => {
+  afterEach(() => {
+    vi.restoreAllMocks();
+    document
+      .querySelectorAll("[data-locale-scroll-fixture]")
+      .forEach((node) => node.remove());
+  });
+
+  it("marks top-anchored scroll positions and skips section lookup", () => {
+    mockGeometryWithFixture({ scrollY: 10, navbarHeight: 60 });
+    const context = captureLocaleScrollContext("home");
+    expect(context).toEqual({
+      pageRatio: expect.any(Number),
+      sectionKey: null,
+      sectionProgress: null,
+      topAnchor: true,
+    });
+  });
+
+  it("captures the section centered in the viewport and a relative progress", () => {
+    mockGeometryWithFixture({
+      navbarHeight: 60,
+      innerHeight: 800,
+      scrollY: 2000,
+      sections: {
+        hero: { top: -3000, height: 900 },
+        sobremi: { top: -900, height: 400 },
+        portfolio: { top: -100, height: 1600 },
+        contacto: { top: 1500, height: 500 },
+        faq: { top: 2000, height: 400 },
+      },
+    });
+
+    const context = captureLocaleScrollContext("home");
+    expect(context.topAnchor).toBe(false);
+    expect(context.sectionKey).toBe("portfolio");
+    expect(context.sectionProgress).toBeGreaterThan(0);
+    expect(context.sectionProgress).toBeLessThan(1);
+  });
+
+  it("falls back to the page ratio when no section id is present on the page", () => {
+    mockGeometryWithFixture({ scrollY: 900, innerHeight: 800, scrollHeight: 5000 });
+    const context = captureLocaleScrollContext("portfolio");
+    expect(context.sectionKey).toBeNull();
+    expect(context.sectionProgress).toBeNull();
+    expect(context.pageRatio).toBeCloseTo(900 / (5000 - 800), 5);
+  });
+
+  it("restores by aligning the same section id at the captured progress", () => {
+    mockGeometryWithFixture({
+      navbarHeight: 60,
+      innerHeight: 800,
+      sections: { faq: { top: 200, height: 400 } },
+    });
+    const scrollToSpy = getScrollToSpy();
+
+    restoreLocaleScrollContext({
+      pageRatio: 0.5,
+      sectionKey: "faq",
+      sectionProgress: 0.25,
+      topAnchor: false,
+    });
+
+    expect(scrollToSpy).toHaveBeenCalledTimes(1);
+    const [call] = scrollToSpy.mock.calls[0] as [ScrollToOptions];
+    expect(call.left).toBe(0);
+    // navbarHeight 60, innerHeight 800 -> viewportCenter 430; faq top 200 + 0.25*400 = 300
+    expect(call.top).toBe(300 - 430);
+  });
+
+  it("does nothing when the captured context is top-anchored", () => {
+    mockGeometryWithFixture({});
+    const scrollToSpy = getScrollToSpy();
+
+    restoreLocaleScrollContext({
+      pageRatio: 0,
+      sectionKey: null,
+      sectionProgress: null,
+      topAnchor: true,
+    });
+
+    expect(scrollToSpy).not.toHaveBeenCalled();
+  });
+
+  it("recognizes only well-formed locale-switch navigation state", () => {
+    expect(isLocaleSwitchNavigationState(undefined)).toBe(false);
+    expect(isLocaleSwitchNavigationState(null)).toBe(false);
+    expect(isLocaleSwitchNavigationState({})).toBe(false);
+    expect(isLocaleSwitchNavigationState({ localeSwitch: true })).toBe(false);
+    expect(
+      isLocaleSwitchNavigationState({
+        localeSwitch: true,
+        scrollContext: {
+          pageRatio: 0,
+          sectionKey: null,
+          sectionProgress: null,
+          topAnchor: true,
+        },
+      }),
+    ).toBe(true);
+  });
+});
+
+describe("language switch — scroll and focus integration", () => {
+  beforeEach(() => {
+    localStorage.setItem("language", "es");
+  });
+
+  afterEach(() => {
+    vi.restoreAllMocks();
+  });
+
+  it("does not reset scroll to top when switching language mid-page (regression guard for the reported bug)", async () => {
+    mockGeometry({
+      navbarHeight: 60,
+      innerHeight: 800,
+      scrollY: 2000,
+      sections: {
+        hero: { top: -3000, height: 900 },
+        sobremi: { top: -900, height: 400 },
+        portfolio: { top: -100, height: 1600 },
+        contacto: { top: 1500, height: 500 },
+        faq: { top: 2000, height: 400 },
+      },
+    });
+    const scrollToSpy = getScrollToSpy();
+    const user = userEvent.setup();
+    renderApp("/portfolio");
+    await screen.findByRole("heading", { level: 1, name: "Algunos trabajos" });
+
+    await user.click(screen.getByRole("button", { name: "Cambiar a inglés" }));
+    await screen.findByRole("heading", { level: 1, name: "Some Work" });
+
+    await waitFor(() => {
+      const topCalls = scrollToSpy.mock.calls.filter(
+        (call) => (call[0] as ScrollToOptions)?.top === 0,
+      );
+      expect(topCalls).toHaveLength(0);
+    });
+  });
+
+  it("stays at the top when the user was already at the top before switching", async () => {
+    mockGeometry({ scrollY: 0, navbarHeight: 60 });
+    const scrollToSpy = getScrollToSpy();
+    const user = userEvent.setup();
+    renderApp("/");
+    await screen.findByRole("heading", {
+      level: 1,
+      name: "Sitios web que comunican y convierten.",
+    });
+
+    await user.click(screen.getByRole("button", { name: "Cambiar a inglés" }));
+    await screen.findByRole("heading", {
+      level: 1,
+      name: "Websites built to communicate and convert.",
+    });
+
+    await new Promise((resolve) => setTimeout(resolve, 50));
+    expect(scrollToSpy).not.toHaveBeenCalled();
+  });
+
+  it("still scrolls to top for a normal Navbar navigation (not a locale switch)", async () => {
+    mockGeometry({
+      navbarHeight: 60,
+      innerHeight: 800,
+      scrollY: 2000,
+      sections: { portfolio: { top: -100, height: 1600 } },
+    });
+    const scrollToSpy = getScrollToSpy();
+    const user = userEvent.setup();
+    renderApp("/servicios");
+    await screen.findByRole("heading", {
+      level: 1,
+      name: "Sitios web, sistemas y automatización para empresas.",
+    });
+
+    const desktopNavigation = document.querySelector<HTMLElement>(
+      "[data-navbar-desktop]",
+    );
+    if (desktopNavigation === null) throw new Error("Missing desktop Navbar");
+    await user.click(within(desktopNavigation).getByRole("link", { name: "Portfolio" }));
+    await screen.findByRole("heading", { level: 1, name: "Algunos trabajos" });
+
+    await waitFor(() => {
+      expect(scrollToSpy).toHaveBeenCalledWith(
+        expect.objectContaining({ left: 0, top: 0 }),
+      );
+    });
+  });
+
+  it("prioritizes an existing hash target over section-relative restoration", async () => {
+    mockGeometry({
+      navbarHeight: 60,
+      innerHeight: 800,
+      sections: { contacto: { top: 100, height: 400 } },
+    });
+    const scrollToSpy = getScrollToSpy();
+    const user = userEvent.setup();
+    renderApp("/#contacto");
+    await screen.findByRole("heading", {
+      level: 1,
+      name: "Sitios web que comunican y convierten.",
+    });
+
+    await user.click(screen.getByRole("button", { name: "Cambiar a inglés" }));
+    await screen.findByRole("heading", {
+      level: 1,
+      name: "Websites built to communicate and convert.",
+    });
+
+    const contactSection = document.getElementById("contacto");
+    expect(contactSection).not.toBeNull();
+    await waitFor(() => {
+      expect(contactSection?.scrollIntoView).toHaveBeenCalled();
+    });
+    expect(
+      scrollToSpy.mock.calls.some((call) => (call[0] as ScrollToOptions)?.top === 0),
+    ).toBe(false);
+  });
+
+  it("closes the mobile menu on a mobile language switch", async () => {
+    mockGeometry({ scrollY: 0, navbarHeight: 60 });
+    const user = userEvent.setup();
+    renderApp("/");
+    await screen.findByRole("heading", {
+      level: 1,
+      name: "Sitios web que comunican y convierten.",
+    });
+
+    await user.click(screen.getByRole("button", { name: "Abrir menú" }));
+    const mobilePanel = document.getElementById("mobile-navigation-panel");
+    expect(mobilePanel).not.toBeNull();
+    if (mobilePanel === null) throw new Error("Missing mobile navigation panel");
+
+    await user.click(
+      within(mobilePanel).getByRole("button", { name: "Cambiar a inglés" }),
+    );
+
+    await waitFor(() => {
+      expect(document.getElementById("mobile-navigation-panel")).toBeNull();
+    });
+  });
+});
+
+describe("language switch — head reconciliation", () => {
+  beforeEach(() => {
+    localStorage.setItem("language", "es");
+  });
+
+  it("synchronizes html lang, title, canonical and hreflang immediately on switch, with no duplicates", async () => {
+    mockGeometry({ scrollY: 0, navbarHeight: 60 });
+    const user = userEvent.setup();
+    renderApp("/portfolio/lem-box");
+    await screen.findByRole("heading", { level: 1, name: "LEM-BOX" });
+
+    await waitFor(() => {
+      expect(document.documentElement.lang).toBe("es");
+      expect(document.title).toBe(
+        "LEM-BOX: plataforma logística y producto propio | Rodrigo Opalo",
+      );
+    });
+
+    await user.click(screen.getByRole("button", { name: "Cambiar a inglés" }));
+    await screen.findByRole("heading", { level: 1, name: "LEM-BOX" });
+
+    await waitFor(() => {
+      expect(document.documentElement.lang).toBe("en");
+      expect(document.title).toBe(
+        "LEM-BOX: logistics platform and own product | Rodrigo Opalo",
+      );
+      expect(
+        document.head.querySelector('link[rel="canonical"]'),
+      ).toHaveAttribute(
+        "href",
+        "https://www.devrodri.com/en/portfolio/lem-box",
+      );
+      expect(
+        document.head.querySelector('meta[property="og:locale"]'),
+      ).toHaveAttribute("content", "en_US");
+    });
+
+    expect(document.head.querySelectorAll("title")).toHaveLength(1);
+    expect(
+      document.head.querySelectorAll('link[rel="canonical"]'),
+    ).toHaveLength(1);
+    expect(
+      document.head.querySelectorAll('link[rel="alternate"]'),
+    ).toHaveLength(3);
+    expect(
+      document.head.querySelectorAll('script[type="application/ld+json"]'),
+    ).toHaveLength(1);
+  });
+});
diff --git a/src/test/Semantics.test.tsx b/src/test/Semantics.test.tsx
index 196d7bc..5faa7af 100644
--- a/src/test/Semantics.test.tsx
+++ b/src/test/Semantics.test.tsx
@@ -208,7 +208,7 @@ describe("semantic navigation contracts", () => {
     await waitFor(() => expect(nextMain).toHaveFocus());
   });
 
-  it("focuses main for Portfolio, language and 404 route transitions", async () => {
+  it("focuses main for Portfolio and 404 route transitions, but keeps focus on the language toggle for locale switches", async () => {
     const user = userEvent.setup();
     const portfolioRender = renderApp("/portfolio");
     const main = await screen.findByRole("main");
@@ -219,9 +219,13 @@ describe("semantic navigation contracts", () => {
     await screen.findByRole("heading", { level: 1, name: "LEM-BOX" });
     await waitFor(() => expect(main).toHaveFocus());
 
-    await user.click(screen.getByRole("button", { name: "Cambiar a inglés" }));
+    const languageToggle = screen.getByRole("button", {
+      name: "Cambiar a inglés",
+    });
+    await user.click(languageToggle);
     await screen.findByRole("heading", { level: 1, name: "LEM-BOX" });
-    await waitFor(() => expect(main).toHaveFocus());
+    await waitFor(() => expect(languageToggle).toHaveFocus());
+    expect(main).not.toHaveFocus();
 
     portfolioRender.unmount();
     renderApp("/no-existe");