diff --git a/arch/conduwuit.service b/arch/conduwuit.service
index ecf06d01..18fa04f9 100644
--- a/arch/conduwuit.service
+++ b/arch/conduwuit.service
@@ -2,6 +2,7 @@
 Description=conduwuit Matrix homeserver
 After=network.target
 Documentation=https://conduwuit.puppyirl.gay/
+RequiresMountsFor=/var/lib/private/conduwuit
 
 [Service]
 DynamicUser=yes
@@ -38,7 +39,7 @@ SystemCallArchitectures=native
 SystemCallFilter=@system-service @resources
 SystemCallFilter=~@clock @debug @module @mount @reboot @swap @cpu-emulation @obsolete @timer @chown @setuid @privileged @keyring @ipc
 SystemCallErrorNumber=EPERM
-StateDirectory=matrix-conduit
+StateDirectory=conduwuit
 
 RuntimeDirectory=conduwuit
 RuntimeDirectoryMode=0750
@@ -47,9 +48,7 @@ Environment="CONDUIT_CONFIG=/etc/conduwuit/conduwuit.toml"
 
 ExecStart=/usr/bin/conduwuit
 Restart=on-failure
-RestartSec=1
-RestartSteps=1
-RestartMaxDelaySec=6000s
+RestartSec=5
 
 TimeoutStopSec=4m
 TimeoutStartSec=4m