diff --git a/selfdrive/ui/ui_state.py b/selfdrive/ui/ui_state.py
index d75cd25336..1d1817e1fb 100644
--- a/selfdrive/ui/ui_state.py
+++ b/selfdrive/ui/ui_state.py
@@ -277,7 +277,7 @@ class Device:
         HARDWARE.set_display_power(on)
         gui_app.set_should_render(on)
 
-      screensaver_enabled = True #ui_state.params.get_bool("ScreenSaverEnabled")
+      screensaver_enabled = ui_state.params.get_bool("ScreenSaverEnabled")
       if gui_app.sunnypilot_ui() and not on and screensaver_enabled:
         gui_app.set_modal_overlay(ScreenSaverSP(dismiss_callback=lambda: set_display_power()))
       else:
diff --git a/system/ui/sunnypilot/widgets/screen_saver.py b/system/ui/sunnypilot/widgets/screen_saver.py
index b0a2a6b5b4..673c098482 100644
--- a/system/ui/sunnypilot/widgets/screen_saver.py
+++ b/system/ui/sunnypilot/widgets/screen_saver.py
@@ -10,12 +10,11 @@ from openpilot.system.ui.lib.application import gui_app, FontWeight
 from openpilot.system.ui.lib.text_measure import measure_text_cached
 from openpilot.system.ui.widgets import Widget
 
-SCREENSAVER_TIMEOUT = Params().get("ScreenSaverTimeout") or 5
-
 class ScreenSaverSP(Widget):
   def __init__(self, dismiss_callback: Callable):
     super().__init__()
     self.dismiss_callback = dismiss_callback
+    self.screensaver_timeout = Params().get("ScreenSaverTimeout")
 
     self.set_rect(rl.Rectangle(0, 0, gui_app.width, gui_app.height))
     self._is_mici = HARDWARE.get_device_type() == 'mici' or (HARDWARE.get_device_type() == "pc" and os.getenv("BIG") != "1")
@@ -43,7 +42,7 @@ class ScreenSaverSP(Widget):
   def _update_state(self):
     super()._update_state()
 
-    if time.monotonic() - self._start_time > SCREENSAVER_TIMEOUT:
+    if time.monotonic() - self._start_time > self.screensaver_timeout:
       self._dismiss = True
 
     dt = rl.get_frame_time()