diff --git a/display.go b/display.go
index 042bf122..68723b59 100644
--- a/display.go
+++ b/display.go
@@ -305,11 +305,11 @@ func wakeDisplay(force bool, reason string) {
 		displayLogger.Warn().Err(err).Msg("failed to wake display")
 	}
 
-	if config.DisplayDimAfterSec != 0 {
+	if config.DisplayDimAfterSec != 0 && dimTicker != nil {
 		dimTicker.Reset(time.Duration(config.DisplayDimAfterSec) * time.Second)
 	}
 
-	if config.DisplayOffAfterSec != 0 {
+	if config.DisplayOffAfterSec != 0 && offTicker != nil {
 		offTicker.Reset(time.Duration(config.DisplayOffAfterSec) * time.Second)
 	}
 	backlightState = 0
diff --git a/ui/src/routes/devices.$id.settings.hardware.tsx b/ui/src/routes/devices.$id.settings.hardware.tsx
index 75b941d6..42776414 100644
--- a/ui/src/routes/devices.$id.settings.hardware.tsx
+++ b/ui/src/routes/devices.$id.settings.hardware.tsx
@@ -46,10 +46,10 @@ export default function SettingsHardwareRoute() {
     }
 
     setBacklightSettings(settings);
-    handleBacklightSettingsSave();
+    handleBacklightSettingsSave(settings);
   };
 
-  const handleBacklightSettingsSave = () => {
+  const handleBacklightSettingsSave = (backlightSettings: BacklightSettings) => {
     send("setBacklightSettings", { params: backlightSettings }, (resp: JsonRpcResponse) => {
       if ("error" in resp) {
         notifications.error(
@@ -81,7 +81,7 @@ export default function SettingsHardwareRoute() {
     const duration = enabled ? 90 : -1;
     send("setVideoSleepMode", { duration }, (resp: JsonRpcResponse) => {
       if ("error" in resp) {
-        notifications.error(m.hardware_power_saving_failed_error({ error: resp.error.data ||m.unknown_error() }));
+        notifications.error(m.hardware_power_saving_failed_error({ error: resp.error.data || m.unknown_error() }));
         setPowerSavingEnabled(!enabled); // Attempt to revert on error
         return;
       }