From ea16ebd4f0fe90ef3c4623875ddc0b53f79ce3ae Mon Sep 17 00:00:00 2001
From: baflo <834350+baflo@users.noreply.github.com>
Date: Sun, 7 Jan 2018 06:49:44 +0100
Subject: [PATCH] Changed behaviour of selecting base entity. (#735)

---
 src/more-infos/more-info-group.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/more-infos/more-info-group.html b/src/more-infos/more-info-group.html
index a06a446a12..a0d5b062cc 100644
--- a/src/more-infos/more-info-group.html
+++ b/src/more-infos/more-info-group.html
@@ -73,7 +73,7 @@ class MoreInfoGroup extends Polymer.Element {
     var el;
 
     if (states && states.length > 0) {
-      baseStateObj = states[0];
+      baseStateObj = states.find(s => s.state === 'on') || states[0];
 
       groupDomainStateObj = Object.assign({}, baseStateObj, {
         entity_id: stateObj.entity_id,