diff --git a/nspanel-lovelace-ui/config.yaml b/nspanel-lovelace-ui/config.yaml
index f1913a15..8afdcd21 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.58"
+version: "4.7.59"
 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 3f379bae..6d96abb9 100644
--- a/nspanel-lovelace-ui/rootfs/usr/bin/mqtt-manager/panel.py
+++ b/nspanel-lovelace-ui/rootfs/usr/bin/mqtt-manager/panel.py
@@ -232,7 +232,7 @@ class LovelaceUIPanel:
                         return
 
                     # in case privious_cards is empty add a default card
-                    if len(self.privious_cards) == 0:
+                    if len(self.privious_cards) == 0 or self.settings.get("defaultCard"):
                         self.privious_cards.append(self.get_default_card())
                     self.current_card = self.privious_cards.pop()
                     self.render_current_page(switchPages=True)