diff --git a/system/betterlockscreen@.service b/system/betterlockscreen@.service
index a479828..4ef7460 100644
--- a/system/betterlockscreen@.service
+++ b/system/betterlockscreen@.service
@@ -1,5 +1,7 @@
 [Unit]
 Description = Lock screen when going to sleep/suspend
+Before=sleep.target
+Before=suspend.target
 
 [Service]
 User=%I
@@ -7,6 +9,7 @@ Type=simple
 Environment=DISPLAY=:0
 ExecStart=/usr/bin/betterlockscreen --lock
 TimeoutSec=infinity
+ExecStartPost=/sbin/sleep 1
 
 [Install]
 WantedBy=sleep.target