diff --git a/src/layouts/hass-tabs-subpage-data-table.ts b/src/layouts/hass-tabs-subpage-data-table.ts index 1965d856aa..81297196d1 100644 --- a/src/layouts/hass-tabs-subpage-data-table.ts +++ b/src/layouts/hass-tabs-subpage-data-table.ts @@ -204,10 +204,10 @@ export class HaTabsSubpageDataTable extends KeyboardShortcutMixin(LitElement) { if (this.hasUpdated) { return; } - if (this.initialGroupColumn) { + if (this.initialGroupColumn && this.columns[this.initialGroupColumn]) { this._setGroupColumn(this.initialGroupColumn); } - if (this.initialSorting) { + if (this.initialSorting && this.columns[this.initialSorting.column]) { this._sortColumn = this.initialSorting.column; this._sortDirection = this.initialSorting.direction; } @@ -307,9 +307,10 @@ export class HaTabsSubpageDataTable extends KeyboardShortcutMixin(LitElement) {