diff --git a/ui-ngx/src/app/modules/home/components/profile/queue/tenant-profile-queues.component.ts b/ui-ngx/src/app/modules/home/components/profile/queue/tenant-profile-queues.component.ts
index a403f8e82e..7f4de4c68a 100644
--- a/ui-ngx/src/app/modules/home/components/profile/queue/tenant-profile-queues.component.ts
+++ b/ui-ngx/src/app/modules/home/components/profile/queue/tenant-profile-queues.component.ts
@@ -130,12 +130,8 @@ export class TenantProfileQueuesComponent implements ControlValueAccessor, Valid
     });
   }
 
-  public trackByQueue(index: number, queueControl: AbstractControl): string {
-    if (queueControl) {
-      return queueControl.value.id;
-    } else {
-      return null;
-    }
+  public trackByQueue(index: number, queueControl: AbstractControl) {
+    return queueControl;
   }
 
   public removeQueue(index: number) {
diff --git a/ui-ngx/src/app/modules/home/components/profile/tenant-profile.component.html b/ui-ngx/src/app/modules/home/components/profile/tenant-profile.component.html
index 789ba8590a..fb20387608 100644
--- a/ui-ngx/src/app/modules/home/components/profile/tenant-profile.component.html
+++ b/ui-ngx/src/app/modules/home/components/profile/tenant-profile.component.html
@@ -68,35 +68,37 @@
           <div class="tb-hint">{{'tenant.isolated-tb-rule-engine-details' | translate}}</div>
         </mat-checkbox>
       </div>
-      <mat-accordion formGroupName="profileData" multi>
-        <mat-expansion-panel [expanded]="true" *ngIf="entityForm.get('isolatedTbRuleEngine').value">
-          <mat-expansion-panel-header>
-            <mat-panel-title>
-              {{'tenant-profile.queues-with-count' | translate:
-                {count: entityForm.get('profileData').get('queueConfiguration').value ?
-                    entityForm.get('profileData').get('queueConfiguration').value.length : 0} }}
-            </mat-panel-title>
-          </mat-expansion-panel-header>
-          <ng-template matExpansionPanelContent>
-            <tb-tenant-profile-queues
-              formControlName="queueConfiguration"
-            ></tb-tenant-profile-queues>
-          </ng-template>
-        </mat-expansion-panel>
-        <mat-expansion-panel [expanded]="true">
-          <mat-expansion-panel-header>
-            <mat-panel-title>
-              <div translate>tenant-profile.profile-configuration</div>
-            </mat-panel-title>
-          </mat-expansion-panel-header>
-          <ng-template matExpansionPanelContent>
-            <tb-tenant-profile-data
-              formControlName="configuration"
-              required>
-            </tb-tenant-profile-data>
-          </ng-template>
-        </mat-expansion-panel>
-      </mat-accordion>
+      <div class="expansion-panel-block">
+        <mat-accordion formGroupName="profileData" multi>
+          <mat-expansion-panel [expanded]="true" *ngIf="entityForm.get('isolatedTbRuleEngine').value">
+            <mat-expansion-panel-header>
+              <mat-panel-title>
+                {{'tenant-profile.queues-with-count' | translate:
+                  {count: entityForm.get('profileData').get('queueConfiguration').value ?
+                      entityForm.get('profileData').get('queueConfiguration').value.length : 0} }}
+              </mat-panel-title>
+            </mat-expansion-panel-header>
+            <ng-template matExpansionPanelContent>
+              <tb-tenant-profile-queues
+                formControlName="queueConfiguration"
+              ></tb-tenant-profile-queues>
+            </ng-template>
+          </mat-expansion-panel>
+          <mat-expansion-panel [expanded]="true">
+            <mat-expansion-panel-header>
+              <mat-panel-title>
+                <div translate>tenant-profile.profile-configuration</div>
+              </mat-panel-title>
+            </mat-expansion-panel-header>
+            <ng-template matExpansionPanelContent>
+              <tb-tenant-profile-data
+                formControlName="configuration"
+                required>
+              </tb-tenant-profile-data>
+            </ng-template>
+          </mat-expansion-panel>
+        </mat-accordion>
+      </div>
       <mat-form-field class="mat-block">
         <mat-label translate>tenant-profile.description</mat-label>
         <textarea matInput formControlName="description" rows="2"></textarea>
diff --git a/ui-ngx/src/app/modules/home/components/profile/tenant-profile.component.scss b/ui-ngx/src/app/modules/home/components/profile/tenant-profile.component.scss
index e6e5d3b9cf..c76509e9e3 100644
--- a/ui-ngx/src/app/modules/home/components/profile/tenant-profile.component.scss
+++ b/ui-ngx/src/app/modules/home/components/profile/tenant-profile.component.scss
@@ -35,4 +35,7 @@
       width: fit-content;
     }
   }
+  .expansion-panel-block {
+    padding-bottom: 16px;
+  }
 }