diff --git a/src/panels/lovelace/cards/hui-gauge-card.ts b/src/panels/lovelace/cards/hui-gauge-card.ts
index 9378f4da0f..3297515f53 100644
--- a/src/panels/lovelace/cards/hui-gauge-card.ts
+++ b/src/panels/lovelace/cards/hui-gauge-card.ts
@@ -131,6 +131,14 @@ class HuiGaugeCard extends LitElement implements LovelaceCard {
 
     const sliderBarColor = this._computeSeverity(state);
 
+    let value: number | undefined;
+
+    if (this._config.max === null || isNaN(this._config.max!)) {
+      value = undefined;
+    } else {
+      value = Math.min(this._config.max!, state);
+    }
+
     return html`
       <ha-card
         @click=${this._handleClick}
@@ -143,7 +151,7 @@ class HuiGaugeCard extends LitElement implements LovelaceCard {
           readonly
           arcLength="180"
           startAngle="180"
-          .value=${state}
+          .value=${value}
           .min=${this._config.min}
           .max=${this._config.max}
         ></round-slider>
@@ -243,6 +251,10 @@ class HuiGaugeCard extends LitElement implements LovelaceCard {
   }
 
   private _measureCard() {
+    if (!this.isConnected) {
+      return;
+    }
+
     if (this.offsetWidth < 200) {
       this.setAttribute("narrow", "");
     } else {
@@ -257,6 +269,10 @@ class HuiGaugeCard extends LitElement implements LovelaceCard {
 
   static get styles(): CSSResult {
     return css`
+      :host {
+        display: block;
+      }
+
       ha-card {
         cursor: pointer;
         height: 100%;