diff --git a/templates/partials/app-topbar.phtml b/templates/partials/app-topbar.phtml
index ce2fa3d..ffc6c64 100644
--- a/templates/partials/app-topbar.phtml
+++ b/templates/partials/app-topbar.phtml
@@ -85,7 +85,7 @@ $moduleTopbarSlots = is_array($moduleSlots['topbar.right_item'] ?? null) ? $modu
         ?>
       <?php endforeach; ?>
       <?php if ($canSwitchTenant): ?>
-        <li data-app-component="tenant-switcher" data-tenant-switcher data-tooltip="<?php e(t('Tenant')); ?>" data-tooltip-pos="bottom">
+        <li data-app-component="tenant-switcher" data-tenant-switcher data-switch-tenant-url="<?php e(lurl('admin/users/switch-tenant')); ?>" data-tooltip="<?php e(t('Tenant')); ?>" data-tooltip-pos="bottom">
           <details class="dropdown app-topbar-tenant-menu" data-summary-chevron="none">
             <summary aria-label="<?php e(t('Switch tenant')); ?>" title="<?php e($tenantLabel); ?>">
               <i class="bi bi-building" aria-hidden="true"></i>
@@ -127,7 +127,7 @@ $moduleTopbarSlots = is_array($moduleSlots['topbar.right_item'] ?? null) ? $modu
         <details class="dropdown app-topbar-user-menu" data-summary-chevron="none" data-app-component="theme-controls"
           <?php if ($allowUserTheme): ?>
             data-theme-menu
-            data-theme-url="admin/users/theme"
+            data-theme-url="<?php e(lurl('admin/users/theme')); ?>"
             data-csrf-key="<?php e($csrfKey); ?>"
             data-csrf-token="<?php e($csrfToken); ?>"
           <?php endif; ?>>
diff --git a/web/js/components/app-tenant-switcher.js b/web/js/components/app-tenant-switcher.js
index 056301f..4930111 100644
--- a/web/js/components/app-tenant-switcher.js
+++ b/web/js/components/app-tenant-switcher.js
@@ -18,14 +18,14 @@ const setPending = (link, pending) => {
   }
 };
 
-const switchTenant = async (link) => {
+const switchTenant = async (link, switchUrl) => {
   const tenantId = link.dataset.switchTenant;
   const csrfKey = link.dataset.csrfKey;
   const csrfToken = link.dataset.csrfToken;
   const errorMessage = link.dataset.errorMessage || 'Failed to switch tenant';
 
-  if (!tenantId || !csrfKey || !csrfToken) {
-    warnOnce('UI_DATA_MISSING', 'Missing tenant ID or CSRF token', { module: 'tenant-switcher' });
+  if (!tenantId || !csrfKey || !csrfToken || !switchUrl) {
+    warnOnce('UI_DATA_MISSING', 'Missing tenant ID, CSRF token, or switch URL', { module: 'tenant-switcher' });
     return;
   }
 
@@ -33,7 +33,7 @@ const switchTenant = async (link) => {
   setPending(link, true);
 
   try {
-    const data = await postForm('admin/users/switch-tenant', {
+    const data = await postForm(switchUrl, {
       tenant_id: tenantId,
       [csrfKey]: csrfToken
     });
@@ -71,11 +71,20 @@ export const initTenantSwitcher = (root = document, options = {}) => {
     return { destroy: () => {} };
   }
 
+  // Endpoint is rendered server-side via lurl() so it carries the locale-aware
+  // absolute path. Passing a relative path to postForm would resolve against
+  // window.location.href and break on deep routes like /de/admin/tenants/edit/...
+  const switchUrl = (switcherRoot instanceof HTMLElement ? switcherRoot.dataset.switchTenantUrl : '') || '';
+  if (!switchUrl) {
+    warnOnce('UI_DATA_MISSING', 'Missing data-switch-tenant-url on tenant switcher root', { module: 'tenant-switcher' });
+    return { destroy: () => {} };
+  }
+
   const cleanupFns = [];
   tenantLinks.forEach(link => {
     const onClick = (e) => {
       e.preventDefault();
-      switchTenant(link);
+      switchTenant(link, switchUrl);
     };
     link.addEventListener('click', onClick);
     cleanupFns.push(() => link.removeEventListener('click', onClick));