diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/alarm/alarms-table-widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/alarm/alarms-table-widget.component.ts
index d1b52dcf03..614b62710f 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/alarm/alarms-table-widget.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/alarm/alarms-table-widget.component.ts
@@ -727,8 +727,7 @@ export class AlarmsTableWidgetComponent extends PageComponent implements OnInit,
       ? (key.type === EntityKeyType.ENTITY_FIELD || key.type === EntityKeyType.ALARM_FIELD ? 'entityField'
          : key.type === EntityKeyType.TIME_SERIES ? 'timeseries' : 'attribute')
       : 'entityField';
-    const keyFilters: KeyFilter[] = null; // TODO:
-    this.alarmsDatasource.loadAlarms(this.pageLink, sortOrderLabel, sortColumnType, keyFilters);
+    this.alarmsDatasource.loadAlarms(this.pageLink, sortOrderLabel, sortColumnType, null);
     this.ctx.detectChanges();
   }
 
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/entity/entities-table-widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/entity/entities-table-widget.component.ts
index 18984b5b83..5d08ada961 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/entity/entities-table-widget.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/entity/entities-table-widget.component.ts
@@ -621,8 +621,7 @@ export class EntitiesTableWidgetComponent extends PageComponent implements OnIni
       ? (key.type === EntityKeyType.ENTITY_FIELD ? 'entityField'
          : key.type === EntityKeyType.TIME_SERIES ? 'timeseries' : 'attribute')
       : 'entityField';
-    const keyFilters: KeyFilter[] = null; // TODO:
-    this.entityDatasource.loadEntities(this.pageLink, sortOrderLabel, sortColumnType, keyFilters);
+    this.entityDatasource.loadEntities(this.pageLink, sortOrderLabel, sortColumnType, null);
     this.ctx.detectChanges();
   }