From cfd0e7260937ca1c196da1b9f80d8f120f081947 Mon Sep 17 00:00:00 2001
From: Aidan Timson <aidan@timmo.dev>
Date: Wed, 18 Mar 2026 15:42:19 +0000
Subject: [PATCH] Fix disabled entity ID in helper settings (#30213)

---
 .../editor-tabs/settings/entity-settings-helper-tab.ts      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/panels/config/entities/editor-tabs/settings/entity-settings-helper-tab.ts b/src/panels/config/entities/editor-tabs/settings/entity-settings-helper-tab.ts
index 0cc795009d..0bb8948a93 100644
--- a/src/panels/config/entities/editor-tabs/settings/entity-settings-helper-tab.ts
+++ b/src/panels/config/entities/editor-tabs/settings/entity-settings-helper-tab.ts
@@ -35,7 +35,7 @@ export class EntitySettingsHelperTab extends LitElement {
 
   @state() private _item?: Helper | null;
 
-  @state() private _submitting?: boolean;
+  @state() private _submitting = false;
 
   @state() private _componentLoaded?: boolean;
 
@@ -97,7 +97,7 @@ export class EntitySettingsHelperTab extends LitElement {
         <entity-registry-settings-editor
           .hass=${this.hass}
           .entry=${this.entry}
-          .disabled=${this._submitting}
+          .disabled=${!!this._submitting}
           @change=${this._entityRegistryChanged}
           hide-name
           hide-icon
@@ -115,7 +115,7 @@ export class EntitySettingsHelperTab extends LitElement {
         </ha-button>
         <ha-button
           @click=${this._updateItem}
-          .disabled=${this._submitting || (this._item && !this._item.name)}
+          .disabled=${!!this._submitting || !!(this._item && !this._item.name)}
         >
           ${this.hass.localize("ui.dialogs.entity_registry.editor.update")}
         </ha-button>