diff --git a/packaging/deb/systemd/grafana-server.service b/packaging/deb/systemd/grafana-server.service
index f99c96fcb13..e1d024750d2 100644
--- a/packaging/deb/systemd/grafana-server.service
+++ b/packaging/deb/systemd/grafana-server.service
@@ -12,6 +12,7 @@ Type=simple
 WorkingDirectory=/usr/share/grafana
 ExecStart=/usr/sbin/grafana-server                                \
                             --config=${CONF_FILE}                 \
+                            --pidfile=${PID_FILE}                 \
                             cfg:default.paths.logs=${LOG_DIR}     \
                             cfg:default.paths.data=${DATA_DIR}    \
 LimitNOFILE=10000
diff --git a/packaging/rpm/systemd/grafana-server.service b/packaging/rpm/systemd/grafana-server.service
index 56a958032b7..855dce53d08 100644
--- a/packaging/rpm/systemd/grafana-server.service
+++ b/packaging/rpm/systemd/grafana-server.service
@@ -12,6 +12,7 @@ Type=simple
 WorkingDirectory=/usr/share/grafana
 ExecStart=/usr/sbin/grafana-server                                \
                             --config=${CONF_FILE}                 \
+                            --pidfile=${PID_FILE}                 \
                             cfg:default.paths.logs=${LOG_DIR}     \
                             cfg:default.paths.data=${DATA_DIR}    \
 LimitNOFILE=10000