diff --git a/src/components/vsc-indicator-row.ts b/src/components/vsc-indicator-row.ts
index c3f7810..45d40c2 100644
--- a/src/components/vsc-indicator-row.ts
+++ b/src/components/vsc-indicator-row.ts
@@ -251,7 +251,7 @@ export class VscIndicatorRow extends BaseElement {
 
     return html`${subItems.map((item) => {
       return html`
-        <vsc-indicator-item .hass=${this.hass} ._config=${item} ._store=${this._store}></vsc-indicator-item>
+        <vsc-indicator-item ._hass=${this._hass} ._config=${item} ._store=${this._store}></vsc-indicator-item>
       `;
     })}`;
   }
diff --git a/src/editor/components/indicators/panel-row-sub-item.ts b/src/editor/components/indicators/panel-row-sub-item.ts
index 1505e7d..3478be8 100644
--- a/src/editor/components/indicators/panel-row-sub-item.ts
+++ b/src/editor/components/indicators/panel-row-sub-item.ts
@@ -280,6 +280,25 @@ export class PanelRowSubItem extends BaseEditor {
 
     let changed = this.mergeWithCleanup(currentConfig, incoming);
 
+    // ---- normalize state_content against include_state_template ----
+    const include = !!currentConfig.include_state_template;
+    const raw = currentConfig.state_content as string | string[] | undefined;
+    const normalized = this._applyTemplateFlagStable(this._toArray(raw), include);
+    const normalizedOrUndef = normalized.length ? normalized : undefined;
+
+    // only set/delete if it actually changes something
+    const before = Array.isArray(raw) ? raw : this._toArray(raw);
+    if (normalizedOrUndef === undefined) {
+      if ('state_content' in currentConfig) {
+        delete currentConfig.state_content;
+        changed = true;
+      }
+    } else if (!this._arrayEq(before, normalizedOrUndef)) {
+      currentConfig.state_content = normalizedOrUndef;
+      changed = true;
+    }
+    // ---------------------------------------------------------------
+
     if (!changed) return;
     console.debug('Sub-group item config changed:', changed, this._groupItemIndex, currentConfig);
     const newGroupItems = (this._subItemConfig as IndicatorRowGroupConfig).items!.concat();