diff --git a/src/panels/lovelace/components/hui-conditional-base.ts b/src/panels/lovelace/components/hui-conditional-base.ts
index 9142ba758b..d5d6da4e28 100644
--- a/src/panels/lovelace/components/hui-conditional-base.ts
+++ b/src/panels/lovelace/components/hui-conditional-base.ts
@@ -66,6 +66,8 @@ export class HuiConditionalBase extends ReactiveElement {
       if (!this._element.parentElement) {
         this.appendChild(this._element);
       }
+    } else if (this._element.parentElement) {
+      this.removeChild(this._element);
     }
   }
 }