diff --git a/src/more-infos/more-info-content.html b/src/more-infos/more-info-content.html
index fbde6cc5e2..398bcdd581 100644
--- a/src/more-infos/more-info-content.html
+++ b/src/more-infos/more-info-content.html
@@ -25,34 +25,32 @@ class MoreInfoContent extends Polymer.Element {
 
   static get properties() {
     return {
-      hass: {
-        type: Object,
-      },
-
-      stateObj: {
-        type: Object,
-        observer: 'stateObjChanged',
-      },
+      hass: Object,
+      stateObj: Object,
     };
   }
 
+  static get observers() {
+    return [
+      'stateObjChanged(stateObj, hass)',
+    ];
+  }
+
   constructor() {
     super();
     this.style.display = 'block';
   }
 
-  stateObjChanged(stateObj) {
-    var rootEl;
-    if (!stateObj) {
+  stateObjChanged(stateObj, hass) {
+    if (!stateObj || !hass) {
       // If root has lastChild, set 'isVisible' attribute of that child to false.
-      rootEl = Polymer.dom(this);
-      if (rootEl.lastChild) {
-        rootEl.lastChild.isVisible = false;
+      if (this.lastChild) {
+        this.lastChild.isVisible = false;
       }
     } else {
       window.hassUtil.dynamicContentUpdater(
         this, 'MORE-INFO-' + window.hassUtil.stateMoreInfoType(stateObj).toUpperCase(),
-        { hass: this.hass, stateObj: stateObj, isVisible: true }
+        { hass: hass, stateObj: stateObj, isVisible: true }
       );
     }
   }