diff --git a/apps/nspanel-lovelace-ui/luibackend/config.py b/apps/nspanel-lovelace-ui/luibackend/config.py
index a89e7477..010d1fff 100644
--- a/apps/nspanel-lovelace-ui/luibackend/config.py
+++ b/apps/nspanel-lovelace-ui/luibackend/config.py
@@ -38,8 +38,12 @@ class Card(object):
         self.cardType = card_input_config.get("type", "unknown")
         self.title =  card_input_config.get("title", "unknown")
         self.key = card_input_config.get("key", "unknown")
-        self.nav1Override = card_input_config.get("navItem1")
-        self.nav2Override = card_input_config.get("navItem2")
+        self.nav1Override = None
+        if card_input_config.get("navItem1"):
+            self.nav1Override = Entity(card_input_config.get("navItem1"))
+        self.nav2Override = None
+        if card_input_config.get("navItem2"):
+            self.nav2Override = Entity(card_input_config.get("navItem2"))
         self.sleepTimeout  = card_input_config.get("sleepTimeout")
         self.last_update = 0
         self.cooldown = card_input_config.get("cooldown", 0)
diff --git a/apps/nspanel-lovelace-ui/luibackend/pages.py b/apps/nspanel-lovelace-ui/luibackend/pages.py
index 3e03063e..98a04c39 100644
--- a/apps/nspanel-lovelace-ui/luibackend/pages.py
+++ b/apps/nspanel-lovelace-ui/luibackend/pages.py
@@ -695,10 +695,10 @@ class LuiPagesGen(object):
             rightBtn = "delete~~~~~"
 
         if card.nav1Override is not None:
-            leftBtn = self.generate_entities_item(Entity(card.nav1Override))[1:]
+            leftBtn = self.generate_entities_item(card.nav1Override)[1:]
 
         if card.nav2Override is not None:
-            rightBtn = self.generate_entities_item(Entity(card.nav2Override))[1:]
+            rightBtn = self.generate_entities_item(card.nav2Override)[1:]
 
         navigation = f"{leftBtn}~{rightBtn}"