diff --git a/npm/ng-packs/packages/core/src/lib/services/multi-tenancy.service.ts b/npm/ng-packs/packages/core/src/lib/services/multi-tenancy.service.ts
index 7724106cfe..99371f91e7 100644
--- a/npm/ng-packs/packages/core/src/lib/services/multi-tenancy.service.ts
+++ b/npm/ng-packs/packages/core/src/lib/services/multi-tenancy.service.ts
@@ -2,7 +2,10 @@ import { Injectable, Inject } from '@angular/core';
 import { switchMap, map } from 'rxjs/operators';
 import { Observable } from 'rxjs';
 import { ABP } from '../models/common';
-import { FindTenantResultDto } from '../proxy/volo/abp/asp-net-core/mvc/multi-tenancy/models';
+import {
+  FindTenantResultDto,
+  CurrentTenantDto,
+} from '../proxy/volo/abp/asp-net-core/mvc/multi-tenancy/models';
 import { RestService } from './rest.service';
 import { AbpTenantService } from '../proxy/pages/abp/multi-tenancy';
 import { ConfigStateService } from './config-state.service';
@@ -11,6 +14,8 @@ import { TENANT_KEY } from '../tokens/tenant-key.token';
 
 @Injectable({ providedIn: 'root' })
 export class MultiTenancyService {
+  domainTenant: CurrentTenantDto = null;
+
   isTenantBoxVisible = true;
 
   apiName = 'abp';
diff --git a/npm/ng-packs/packages/core/src/lib/utils/multi-tenancy-utils.ts b/npm/ng-packs/packages/core/src/lib/utils/multi-tenancy-utils.ts
index 87e4d68c9e..ea2b3d9765 100644
--- a/npm/ng-packs/packages/core/src/lib/utils/multi-tenancy-utils.ts
+++ b/npm/ng-packs/packages/core/src/lib/utils/multi-tenancy-utils.ts
@@ -35,15 +35,24 @@ export async function parseTenantFromUrl(injector: Injector) {
     multiTenancyService.isTenantBoxVisible = false;
   };
 
-  const setEnvironmentWithTenant = (tenant: FindTenantResultDto) => {
+  const setDomainTenant = (tenant: FindTenantResultDto) => {
+    multiTenancyService.domainTenant = {
+      id: tenant.tenantId,
+      name: tenant.name,
+      isAvailable: true,
+    };
+  };
+
+  const setEnvironmentWithDomainTenant = (tenant: FindTenantResultDto) => {
     hideTenantBox();
+    setDomainTenant(tenant);
     replaceTenantNameWithinEnvironment(injector, tenant.name);
   };
 
   if (tenancyName) {
     return multiTenancyService
       .setTenantByName(tenancyName)
-      .pipe(tap(setEnvironmentWithTenant))
+      .pipe(tap(setEnvironmentWithDomainTenant))
       .toPromise();
   } else {
     /**