diff --git a/src/lib/tenants/services/tenants.service.ts b/src/lib/tenants/services/tenants.service.ts
index 1a7b414..587243e 100644
--- a/src/lib/tenants/services/tenants.service.ts
+++ b/src/lib/tenants/services/tenants.service.ts
@@ -43,7 +43,9 @@ export class TenantsService {
         if (tenant) {
             this.#logger.info('[TENANTS] Tenant from route: ', tenant);
             if (await this.selectTenant(tenant)) {
-                await this.#router.navigate([tenant]);
+                const intendedPath = window.location.pathname.replace(this.#baseHref, '');
+                await this.#router.navigate([tenant], { skipLocationChange: true });
+                await this.#router.navigateByUrl(intendedPath);
             }
             return;
         }