diff --git a/src/app/organizations/manage/user-groups.component.html b/src/app/organizations/manage/user-groups.component.html
index b2089b2e102..9a1c3021d40 100644
--- a/src/app/organizations/manage/user-groups.component.html
+++ b/src/app/organizations/manage/user-groups.component.html
@@ -19,12 +19,6 @@
                     {{'noGroupsInList' | i18n}}
                 </div>
                 <table class="table table-hover table-list mb-0" *ngIf="groups && groups.length">
-                    <thead>
-                        <tr>
-                            <th>&nbsp;</th>
-                            <th>{{'name' | i18n}}</th>
-                        </tr>
-                    </thead>
                     <tbody>
                         <tr *ngFor="let g of groups; let i = index">
                             <td class="table-list-checkbox" (click)="check(g)">
diff --git a/src/app/vault/collections.component.html b/src/app/vault/collections.component.html
index e4862316f54..1508f4c2b0a 100644
--- a/src/app/vault/collections.component.html
+++ b/src/app/vault/collections.component.html
@@ -14,16 +14,19 @@
                 <p>{{'collectionsDesc' | i18n}}</p>
                 <div class="d-flex">
                     <h3>{{'collections' | i18n}}</h3>
-                    <small class="ml-auto d-flex">
+                    <div class="ml-auto d-flex" *ngIf="collections && collections.length">
                         <button type="button" appBlurClick (click)="selectAll(true)" class="btn btn-link btn-sm py-0">
                             {{'selectAll' | i18n}}
                         </button>
                         <button type="button" appBlurClick (click)="selectAll(false)" class="btn btn-link btn-sm py-0">
                             {{'unselectAll' | i18n}}
                         </button>
-                    </small>
+                    </div>
                 </div>
-                <table class="table table-hover table-list mb-0" *ngIf="collections">
+                <div *ngIf="!collections || !collections.length">
+                    {{'noCollectionsInList' | i18n}}
+                </div>
+                <table class="table table-hover table-list mb-0" *ngIf="collections && collections.length">
                     <tbody>
                         <tr *ngFor="let c of collections; let i = index" (click)="check(c)">
                             <td class="table-list-checkbox">