diff --git a/packer/linux/conf/buildkite-agent/systemd/buildkite-agent.service b/packer/linux/conf/buildkite-agent/systemd/buildkite-agent.service
index 40e91919b..42cc7b841 100644
--- a/packer/linux/conf/buildkite-agent/systemd/buildkite-agent.service
+++ b/packer/linux/conf/buildkite-agent/systemd/buildkite-agent.service
@@ -18,7 +18,7 @@ RestartSec=5
 Restart=on-failure
 RestartForceExitStatus=SIGPIPE
 TimeoutStartSec=10
-TimeoutStopSec=0
+TimeoutStopSec=infinity
 KillMode=process
 
 [Install]