diff --git a/etc/service/telegraf.service b/etc/service/telegraf.service
index e42e4d33..b73ef2ac 100644
--- a/etc/service/telegraf.service
+++ b/etc/service/telegraf.service
@@ -8,7 +8,10 @@ Type=simple
 ExecStart=/opt/telegraf/usr/bin/telegraf --config etc/telegraf/telegraf.conf --output-filter opentsdb
 WorkingDirectory=/opt/telegraf
 
-Restart=on-failure
+KillMode=process
+KillSignal=SIGQUIT
+TimeoutStopSec=5
+Restart=always
 SuccessExitStatus=0
 LimitNOFILE=65536
 StandardOutput=syslog