diff --git a/src/panels/lovelace/cards/hui-conditional-card.js b/src/panels/lovelace/cards/hui-conditional-card.js
index 9add425bf9..8a7d0ce8da 100644
--- a/src/panels/lovelace/cards/hui-conditional-card.js
+++ b/src/panels/lovelace/cards/hui-conditional-card.js
@@ -74,6 +74,7 @@ class HuiConditionalCard extends PolymerElement {
       return false;
     });
     root.classList.toggle('hidden', !visible);
+    this.style.setProperty('margin', (!visible) ? '0' : null);
   }
 }
 customElements.define('hui-conditional-card', HuiConditionalCard);