diff --git a/etc/init/pandora-encoding.conf b/etc/init/pandora-encoding.conf
index e960373e..1720297e 100644
--- a/etc/init/pandora-encoding.conf
+++ b/etc/init/pandora-encoding.conf
@@ -7,6 +7,7 @@ start on runlevel [2345]
 stop on runlevel [!2345]
 
 respawn
+reload signal TERM
 
 env VENV=/srv/pandora
 env USER=pandora
diff --git a/etc/init/pandora-tasks.conf b/etc/init/pandora-tasks.conf
index 77882f0b..7dc002cd 100644
--- a/etc/init/pandora-tasks.conf
+++ b/etc/init/pandora-tasks.conf
@@ -7,6 +7,7 @@ start on runlevel [2345]
 stop on runlevel [!2345]
 
 respawn
+reload signal TERM
 
 env VENV=/srv/pandora
 env USER=pandora
diff --git a/etc/systemd/pandora-encoding.service b/etc/systemd/pandora-encoding.service
index 3b2cec07..a8e3c094 100644
--- a/etc/systemd/pandora-encoding.service
+++ b/etc/systemd/pandora-encoding.service
@@ -15,7 +15,7 @@ ExecStart=/srv/pandora/bin/python /srv/pandora/pandora/manage.py \
     -Q encoding -n pandora-encoding \
     --pidfile /run/pandora/encoding.pid \
     -l INFO
-ExecReload=/bin/kill -HUP $MAINPID
+ExecReload=/bin/kill -TERM $MAINPID
 
 [Install]
 WantedBy=multi-user.target
diff --git a/etc/systemd/pandora-tasks.service b/etc/systemd/pandora-tasks.service
index 494b3728..3bb4ffa4 100644
--- a/etc/systemd/pandora-tasks.service
+++ b/etc/systemd/pandora-tasks.service
@@ -15,7 +15,7 @@ ExecStart=/srv/pandora/bin/python /srv/pandora/pandora/manage.py \
     -Q default,celery -n pandora-default \
     --pidfile /run/pandora/tasks.pid \
     -l INFO
-ExecReload=/bin/kill -HUP $MAINPID
+ExecReload=/bin/kill -TERM $MAINPID
 
 [Install]
 WantedBy=multi-user.target