diff --git a/libs/ui/src/lib/accounts-table/accounts-table.component.html b/libs/ui/src/lib/accounts-table/accounts-table.component.html
index 35850044e..70e8c41bf 100644
--- a/libs/ui/src/lib/accounts-table/accounts-table.component.html
+++ b/libs/ui/src/lib/accounts-table/accounts-table.component.html
@@ -348,12 +348,12 @@
     <tr
       *matFooterRowDef="displayedColumns()"
       mat-footer-row
-      [ngClass]="{ 'd-none': isLoading || !showFooter }"
+      [ngClass]="{ 'd-none': isLoading() || !showFooter }"
     ></tr>
   </table>
 </div>
 
-@if (isLoading) {
+@if (isLoading()) {
   <ngx-skeleton-loader
     animation="pulse"
     class="px-4 py-3"
diff --git a/libs/ui/src/lib/accounts-table/accounts-table.component.ts b/libs/ui/src/lib/accounts-table/accounts-table.component.ts
index fc9a411bb..dae21e78c 100644
--- a/libs/ui/src/lib/accounts-table/accounts-table.component.ts
+++ b/libs/ui/src/lib/accounts-table/accounts-table.component.ts
@@ -73,7 +73,6 @@ export class GfAccountsTableComponent implements OnChanges, OnDestroy {
   @ViewChild(MatSort) sort: MatSort;
 
   public dataSource = new MatTableDataSource<Account>();
-  public isLoading = true;
   public routeQueryParams: Subscription;
 
   public readonly accounts = input.required<Account[] | undefined>();
@@ -118,6 +117,8 @@ export class GfAccountsTableComponent implements OnChanges, OnDestroy {
     return columns;
   });
 
+  protected readonly isLoading = computed(() => !this.accounts());
+
   private readonly notificationService = inject(NotificationService);
   private readonly router = inject(Router);
   private readonly unsubscribeSubject = new Subject<void>();
@@ -135,16 +136,10 @@ export class GfAccountsTableComponent implements OnChanges, OnDestroy {
   }
 
   public ngOnChanges() {
-    this.isLoading = true;
-
     this.dataSource = new MatTableDataSource(this.accounts());
     this.dataSource.sortingDataAccessor = getLowercase;
 
     this.dataSource.sort = this.sort;
-
-    if (this.accounts()) {
-      this.isLoading = false;
-    }
   }
 
   public onDeleteAccount(aId: string) {