diff --git a/src/app/organizations/manage/entity-users.component.html b/src/app/organizations/manage/entity-users.component.html
index 5b2e6085b31..d602d4bd5c9 100644
--- a/src/app/organizations/manage/entity-users.component.html
+++ b/src/app/organizations/manage/entity-users.component.html
@@ -40,7 +40,7 @@
                             </td>
                             <td class="table-list-options wider">
                                 <button type="button" class="btn btn-sm btn-outline-danger btn-submit" (click)="remove(u)" #removeBtn appBlurClick [disabled]="removeBtn.loading"
-                                    [appApiAction]="actionPromise" *ngIf="!u.accessAll">
+                                    [appApiAction]="actionPromise" *ngIf="entity !== 'collection' || !u.accessAll">
                                     <i class="fa fa-spinner fa-spin"></i>
                                     <span>{{'remove' | i18n}}</span>
                                 </button>
diff --git a/src/app/organizations/manage/entity-users.component.ts b/src/app/organizations/manage/entity-users.component.ts
index 242c12ba0de..906040dea6f 100644
--- a/src/app/organizations/manage/entity-users.component.ts
+++ b/src/app/organizations/manage/entity-users.component.ts
@@ -58,7 +58,7 @@ export class EntityUsersComponent implements OnInit {
     }
 
     async remove(user: any) {
-        if (this.actionPromise != null || user.accessAll) {
+        if (this.actionPromise != null || (this.entity === 'collection' && user.accessAll)) {
             return;
         }