From 5f187c1bb3937fe345d1aa8fe2e2e0bad164111a Mon Sep 17 00:00:00 2001
From: Paul Bottein <paul.bottein@gmail.com>
Date: Wed, 9 Apr 2025 17:51:02 +0200
Subject: [PATCH] Fix data-table group by unknown column (#24987)

---
 src/layouts/hass-tabs-subpage-data-table.ts | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

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) {
           <ha-md-button-menu positioning="popover">
             <ha-assist-chip
               .label=${localize("ui.components.subpage-data-table.group_by", {
-                groupColumn: this._groupColumn
-                  ? ` ${this.columns[this._groupColumn].title || this.columns[this._groupColumn].label}`
-                  : "",
+                groupColumn:
+                  this._groupColumn && this.columns[this._groupColumn]
+                    ? ` ${this.columns[this._groupColumn].title || this.columns[this._groupColumn].label}`
+                    : "",
               })}
               slot="trigger"
             >