diff --git a/src/daemon/systemd.ts b/src/daemon/systemd.ts
index c0a8b495b..2b659ec77 100644
--- a/src/daemon/systemd.ts
+++ b/src/daemon/systemd.ts
@@ -141,10 +141,13 @@ function buildSystemdUnit({
   return [
     "[Unit]",
     "Description=Clawdbot Gateway",
+    "After=network-online.target",
+    "Wants=network-online.target",
     "",
     "[Service]",
     `ExecStart=${execStart}`,
     "Restart=always",
+    "RestartSec=5",
     workingDirLine,
     ...envLines,
     "",