diff --git a/README.md b/README.md
index 118a3b5c..14d60a30 100644
--- a/README.md
+++ b/README.md
@@ -51,7 +51,7 @@ nspanel-1:
   config:
     panelRecvTopic: "tele/tasmota_your_mqtt_topic/RESULT"
     panelSendTopic: "cmnd/tasmota_your_mqtt_topic/CustomSend"
-    timeoutScreensaver: 15000
+    timeoutScreensaver: 15 #in seconds, values between 5 and 60 are allowed
     #brightnessScreensaver: 10
     brightnessScreensaver:
       - time: "7:00:00"
diff --git a/appdaemon/apps.yaml b/appdaemon/apps.yaml
index 93ae5a7e..b823b605 100644
--- a/appdaemon/apps.yaml
+++ b/appdaemon/apps.yaml
@@ -8,7 +8,7 @@ nspanel:
     locale: "de_DE"
     timeFormat: "%H : %M"
     dateFormat: "%A, %d. %B %Y"
-    timeoutScreensaver: 15000 # value in ms, must be between 50 and 65535
+    timeoutScreensaver: 15 #in seconds, values between 5 and 60 are allowed
     #brightnessScreensaver: 10
     brightnessScreensaver:
       - time: "7:00:00"
diff --git a/apps/nspanel-lovelance-ui/nspanel-lovelance-ui.py b/apps/nspanel-lovelance-ui/nspanel-lovelance-ui.py
index 24bfa510..c73f3e63 100644
--- a/apps/nspanel-lovelance-ui/nspanel-lovelance-ui.py
+++ b/apps/nspanel-lovelance-ui/nspanel-lovelance-ui.py
@@ -67,10 +67,11 @@ class NsPanelLovelanceUI:
 
         # set screensaver timeout
         timeout = self.config["timeoutScreensaver"]
-        if timeout > 65535:
-          timeout = 65535
-        if timeout < 50:
-          timeout = 50
+        if timeout > 60:
+          timeout = 60
+        if timeout < 5:
+          timeout = 5
+        timeout = timeout * 1000
         self.send_mqtt_msg("timeout,{0}".format(timeout))
 
         # send screensaver brightness