diff --git a/config/systemd/system/stop-git-annex-after-sleep.service b/config/systemd/system/stop-git-annex-after-sleep.service
new file mode 100644
index 0000000..beb0786
--- /dev/null
+++ b/config/systemd/system/stop-git-annex-after-sleep.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Kill git-annex assistant after resume
+After=sleep.target
+
+[Service]
+Type=oneshot
+ExecStart=pkill -f "^/usr/bin/git-annex assistant"
+
+[Install]
+WantedBy=sleep.target
diff --git a/config/systemd/user/git-annex-assistant@.service b/config/systemd/user/git-annex-assistant@.service
index 90cdf5e..440df39 100644
--- a/config/systemd/user/git-annex-assistant@.service
+++ b/config/systemd/user/git-annex-assistant@.service
@@ -6,7 +6,6 @@ CPUAccounting=true
 CPUQuota=20%
 WorkingDirectory=%I
 ExecStart=/usr/bin/git-annex assistant --foreground
-RuntimeMaxSec=86400
 Restart=always
 
 [Install]