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,