diff --git a/river/.config/river/init b/river/.config/river/init
index aca4288..b703a1a 100755
--- a/river/.config/river/init
+++ b/river/.config/river/init
@@ -56,12 +56,8 @@ riverctl input $T480_POINTER natural-scroll enabled
 riverctl input $T480_POINTER tap enabled
 riverctl input $T480_POINTER tap-button-map left-right-middle
 
-# Lock screen after 10 mins idle or before sleep
-# Turn off displays after 15 mins
-[[ $RIVER_IDLE == "1" ]] && swayidle -w \
-    timeout 600 swaylock \
-    timeout 900 "way-displays -s DISABLED '!.'" resume "way-displays -d DISABLED '!.'" \
-    before-sleep swaylock &
+# Lock screen after 5 mins idle or before sleep
+riverctl spawn "swayidle -w timeout 300 'swaylock -f' before-sleep 'swaylock -f'"
 
 ## Mappings
 # Applications