diff --git a/src/common/const.ts b/src/common/const.ts
index b422818aab..ed50e1133e 100644
--- a/src/common/const.ts
+++ b/src/common/const.ts
@@ -77,6 +77,7 @@ export const DOMAINS_TOGGLE = new Set([
   "input_boolean",
   "light",
   "switch",
+  "group",
 ]);
 
 /** Temperature units. */
diff --git a/src/panels/lovelace/entity-rows/hui-group-entity-row.ts b/src/panels/lovelace/entity-rows/hui-group-entity-row.ts
index f5a56e1c5e..5246b28090 100644
--- a/src/panels/lovelace/entity-rows/hui-group-entity-row.ts
+++ b/src/panels/lovelace/entity-rows/hui-group-entity-row.ts
@@ -52,7 +52,7 @@ class HuiGroupEntityRow extends hassLocalizeLitMixin(LitElement)
     return html`
       <hui-generic-entity-row .hass="${this.hass}" .config="${this._config}">
         ${
-          this._computeCanToggle(stateObj.attributes.entity_id)
+          this._computeCanToggle(stateObj.entity_id)
             ? html`
                 <ha-entity-toggle
                   .hass="${this.hass}"