diff --git a/apps/nspanel-lovelace-ui/luibackend/controller.py b/apps/nspanel-lovelace-ui/luibackend/controller.py
index f9c67d28..c6c65aeb 100644
--- a/apps/nspanel-lovelace-ui/luibackend/controller.py
+++ b/apps/nspanel-lovelace-ui/luibackend/controller.py
@@ -90,7 +90,7 @@ class LuiController(object):
         LOGGER.info(f"Current page has the following items: {self._current_page.get_items()}")
         if entity in self._current_page.get_all_item_names(recursive=False):
             LOGGER.info(f"Callback Entity is on current page: {entity}")
-            self._pages_gen.render_page(self._current_page)
+            self._pages_gen.render_page(self._current_page, send_page_type=False)
             # send detail page update, just in case
             if self._current_page.data.get("type", "unknown") in ["cardGrid", "cardEntities"]:
                 if entity.startswith("light"):
diff --git a/apps/nspanel-lovelace-ui/luibackend/pages.py b/apps/nspanel-lovelace-ui/luibackend/pages.py
index d2ca07b4..76f98e19 100644
--- a/apps/nspanel-lovelace-ui/luibackend/pages.py
+++ b/apps/nspanel-lovelace-ui/luibackend/pages.py
@@ -224,13 +224,14 @@ class LuiPagesGen(object):
             command = f"entityUpd,|{item}|{heading}|{icon}|{title}|{author}|{volume}|{iconplaypause}"
         self._send_mqtt_msg(command)
 
-    def render_page(self, page):
+    def render_page(self, page, send_page_type=True):
         LOGGER.info(page)
         config    = page.data
         page_type = config["type"]
         LOGGER.info(f"Started rendering of page x with type {page_type}")
         # Switch to page
-        self.page_type(page_type)
+        if send_page_type:
+            self.page_type(page_type)
         if page_type in ["cardEntities", "cardGrid"]:
             heading = config.get("heading", "unknown")
             self.generate_entities_page(heading, page.get_items())