diff --git a/src/hui-entities-card.js b/src/hui-entities-card.js
index 3dcd184..0fa85a4 100644
--- a/src/hui-entities-card.js
+++ b/src/hui-entities-card.js
@@ -24,6 +24,8 @@ customElements.whenDefined('hui-entities-card').then(() => {
     }
 
     row.updateComplete.then(apply);
+    if(retval.values[0])
+      retval.values[0].addEventListener("ll-rebuild", apply);
     window.addEventListener("location-changed", apply);
     return retval;
   }