diff --git a/apps/nspanel-lovelace-ui/luibackend/controller.py b/apps/nspanel-lovelace-ui/luibackend/controller.py
index 3672c908..ae48e73f 100644
--- a/apps/nspanel-lovelace-ui/luibackend/controller.py
+++ b/apps/nspanel-lovelace-ui/luibackend/controller.py
@@ -139,7 +139,7 @@ class LuiController(object):
             return
             
         if button_type == "sleepReached":
-            self._pages_gen.page_type("screensaver")
+            self._pages_gen.generate_screensaver_page()
             return
 
         if button_type == "bExit":
diff --git a/apps/nspanel-lovelace-ui/luibackend/mqttListener.py b/apps/nspanel-lovelace-ui/luibackend/mqttListener.py
index 93e59fb7..bec01668 100644
--- a/apps/nspanel-lovelace-ui/luibackend/mqttListener.py
+++ b/apps/nspanel-lovelace-ui/luibackend/mqttListener.py
@@ -41,8 +41,9 @@ class LuiMqttListener(object):
                 # send messages for current page 
                 if not msg_send:
                     self._controller.startup()
-            if msg[1] == "screensaverOpen":
-                self._controller.weather_update("")
+            if msg[1] == "sleepReached":
+                entity_id = msg[2]
+                self._controller.button_press(entity_id, "sleepReached", None)
                 # try to request tasmota driver version again in case it's still None
                 if self._updater.current_tasmota_driver_version is None:
                     self._updater.request_berry_driver_version()
diff --git a/apps/nspanel-lovelace-ui/luibackend/pages.py b/apps/nspanel-lovelace-ui/luibackend/pages.py
index f00c11fc..887efd63 100644
--- a/apps/nspanel-lovelace-ui/luibackend/pages.py
+++ b/apps/nspanel-lovelace-ui/luibackend/pages.py
@@ -55,6 +55,10 @@ class LuiPagesGen(object):
     def page_type(self, target_page):
         self._send_mqtt_msg(f"pageType,{target_page}")
     
+    def generate_screensaver_page(self):
+        self.page_type("screensaver")
+        self.update_screensaver_weather("")
+        
     def update_screensaver_weather(self, kwargs):
         global babel_spec
         we_name = kwargs['weather']