diff --git a/nspanel-lovelace-ui/config.yaml b/nspanel-lovelace-ui/config.yaml
index 89098ca2..1df983a4 100644
--- a/nspanel-lovelace-ui/config.yaml
+++ b/nspanel-lovelace-ui/config.yaml
@@ -1,6 +1,6 @@
 # https://developers.home-assistant.io/docs/add-ons/configuration#add-on-config
 name: NSPanel Lovelace UI Addon
-version: "4.7.49"
+version: "4.7.51"
 slug: nspanel-lovelace-ui
 description: NSPanel Lovelace UI Addon
 services:
diff --git a/nspanel-lovelace-ui/rootfs/usr/bin/mqtt-manager/ha_cards.py b/nspanel-lovelace-ui/rootfs/usr/bin/mqtt-manager/ha_cards.py
index 978ac186..2d485702 100644
--- a/nspanel-lovelace-ui/rootfs/usr/bin/mqtt-manager/ha_cards.py
+++ b/nspanel-lovelace-ui/rootfs/usr/bin/mqtt-manager/ha_cards.py
@@ -25,10 +25,12 @@ class HAEntity(panel_cards.Entity):
 
     def render(self, cardType=""):
 
-        if "icon" in self.config and self.config.get("icon").startswith("ha:"):
-            self.icon_overwrite = libs.home_assistant.get_template(self.config.get("icon"))
-        if "color" in self.config and self.config.get("color").startswith("ha:"):
-            self.color_overwrite = libs.home_assistant.get_template(self.config.get("color"))
+        config_icon = self.config.get("icon", None)
+        if config_icon and isinstance(config_icon, str) and config_icon.startswith("ha:"):
+            self.icon_overwrite = libs.home_assistant.get_template(config_icon)
+        config_color = self.config.get("color", None)
+        if config_color and isinstance(config_color, str) and config_color.startswith("ha:"):
+            self.color_overwrite = libs.home_assistant.get_template(config_color)
 
         if self.etype in ["delete", "navigate", "iText"]:
             out = super().render()