diff --git a/src/panels/lovelace/cards/hui-entity-filter-card.js b/src/panels/lovelace/cards/hui-entity-filter-card.js
index 6241fdeed6..ba062bd517 100644
--- a/src/panels/lovelace/cards/hui-entity-filter-card.js
+++ b/src/panels/lovelace/cards/hui-entity-filter-card.js
@@ -79,10 +79,16 @@ class HuiEntitiesCard extends PolymerElement {
 
   _updateCardConfig(element) {
     if (!element || element.tagName === 'HUI-ERROR-CARD' || !this.hass) return;
+    const entitiesList = this._getEntities(this.hass, this._config.filter);
+    if (entitiesList.length === 0) {
+      this.style.display = (this._config.show_empty === false) ? 'none' : 'block';
+    } else {
+      this.style.display = 'block';
+    }
     element.setConfig(Object.assign(
       {},
       element._filterRawConfig,
-      { entities: this._getEntities(this.hass, this._config.filter) }
+      { entities: entitiesList }
     ));
   }
 }