diff --git a/src/lib/tenants/tenant-resolve/tenant-resolve.component.html b/src/lib/tenants/tenant-resolve/tenant-resolve.component.html
index f6a6857..9a9580f 100644
--- a/src/lib/tenants/tenant-resolve/tenant-resolve.component.html
+++ b/src/lib/tenants/tenant-resolve/tenant-resolve.component.html
@@ -3,13 +3,13 @@
         <div class="heading-l" translate="tenant-resolve.header"></div>
 
         <div class="iqser-input-group required w-400">
-            <mat-form-field>
+            <mat-form-field *ngIf="_tenantsService.tenants() as tenants">
                 <mat-select
                     [placeholder]="'tenant-resolve.form.tenant-placeholder' | translate"
                     class="full-width"
                     formControlName="tenantId"
                 >
-                    <mat-option *ngFor="let option of _tenantsService.tenantData$ | async" [value]="option.tenantId">
+                    <mat-option *ngFor="let option of tenants" [value]="option.tenantId">
                         {{ option.displayName || option.tenantId }}
                     </mat-option>
                 </mat-select>