diff --git a/nspanel-lovelace-ui/config.yaml b/nspanel-lovelace-ui/config.yaml
index 224be672..c529ebe4 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.60"
+version: "4.7.61"
 slug: nspanel-lovelace-ui
 description: NSPanel Lovelace UI Addon
 services:
diff --git a/nspanel-lovelace-ui/rootfs/usr/bin/mqtt-manager/panel.py b/nspanel-lovelace-ui/rootfs/usr/bin/mqtt-manager/panel.py
index 44ed5f77..b7bfc9d8 100644
--- a/nspanel-lovelace-ui/rootfs/usr/bin/mqtt-manager/panel.py
+++ b/nspanel-lovelace-ui/rootfs/usr/bin/mqtt-manager/panel.py
@@ -191,8 +191,8 @@ class LovelaceUIPanel:
 
     def get_default_card(self):
         defaultCard = self.settings.get("defaultCard")
-        if defaultCard:
-            card = self.searchCard(defaultCard)
+        if defaultCard and "." in defaultCard:
+            card = self.searchCard(defaultCard.split(".")[0])
             if card:
                 return card
         return list(self.cards.values())[0]