From cb6985eb7c7a2f937a28f11a01fdb11c405ce6ef Mon Sep 17 00:00:00 2001
From: karwosts <32912880+karwosts@users.noreply.github.com>
Date: Thu, 26 Mar 2026 07:47:57 -0700
Subject: [PATCH] Stabilize map colors (#30354)

---
 src/panels/lovelace/cards/hui-map-card.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/panels/lovelace/cards/hui-map-card.ts b/src/panels/lovelace/cards/hui-map-card.ts
index 6ccc040a95..f05e1176b5 100644
--- a/src/panels/lovelace/cards/hui-map-card.ts
+++ b/src/panels/lovelace/cards/hui-map-card.ts
@@ -424,8 +424,10 @@ class HuiMapCard extends LitElement implements LovelaceCard {
     }
     const computedStyles = getComputedStyle(this);
     color = getColorByIndex(this._colorIndex, computedStyles);
-    this._colorIndex++;
-    this._colorDict[entityId] = color;
+    if (color) {
+      this._colorIndex++;
+      this._colorDict[entityId] = color;
+    }
     return color;
   }