diff --git a/src/chart.ts b/src/chart.ts
index 6920aba..9dd3ca3 100644
--- a/src/chart.ts
+++ b/src/chart.ts
@@ -241,7 +241,7 @@ export class Chart extends LitElement {
           const { state } = normalizeStateValue(
             this.config.unit_prefix,
             Number(subEntity.state),
-            subEntity.attributes.unit_of_measurement || unit_of_measurement,
+            this._getUnitOfMeasurement(subEntity.attributes.unit_of_measurement || unit_of_measurement)
           );
           normalized.state += state;
         });
@@ -252,7 +252,7 @@ export class Chart extends LitElement {
           const { state } = normalizeStateValue(
             this.config.unit_prefix,
             Number(subEntity.state),
-            subEntity.attributes.unit_of_measurement || unit_of_measurement,
+            this._getUnitOfMeasurement(subEntity.attributes.unit_of_measurement || unit_of_measurement)
           );
           // stay positive
           normalized.state -= Math.min(state, normalized.state);
diff --git a/src/ha-sankey-chart.ts b/src/ha-sankey-chart.ts
index 5954e1f..21dc6de 100644
--- a/src/ha-sankey-chart.ts
+++ b/src/ha-sankey-chart.ts
@@ -154,6 +154,11 @@ class SankeyChart extends SubscribeMixin(LitElement) {
         if (ent.type === 'entity') {
           this.entityIds.push(ent.entity_id);
         }
+        ent.children.forEach(childConf => {
+          if (typeof childConf === 'object' && childConf.connection_entity_id) {
+            this.entityIds.push(childConf.connection_entity_id);
+          }
+        });
         if (ent.add_entities) {
           ent.add_entities.forEach(e => this.entityIds.push(e));
         }