diff --git a/systemd/pilersearch.service b/systemd/pilersearch.service
index c12172bf..e40020df 100644
--- a/systemd/pilersearch.service
+++ b/systemd/pilersearch.service
@@ -5,6 +5,7 @@ After=network.target mariadb.service
 [Service]
 ExecStart=/usr/bin/searchd --config /etc/piler/manticore.conf
 ExecStartPre=/bin/bash -c "if [[ ! -d /var/run/piler ]]; then mkdir -p /var/run/piler; chown piler:piler /var/run/piler; fi"
+ExecStop=/usr/bin/searchd --config /etc/piler/manticore.conf --stopwait
 PIDFile=/var/run/piler/searchd.pid
 KillMode=process
 Restart=on-failure