diff --git a/etc/init.d/pandora-tasks b/etc/init.d/pandora-tasks
index 37dc9965..13eebbf1 100755
--- a/etc/init.d/pandora-tasks
+++ b/etc/init.d/pandora-tasks
@@ -19,7 +19,7 @@ PANDORA_BASE=/srv/pandora
 DAEMON_USER="pandora"
 DAEMON_NAME=pandora/manage.py
 DAEMON="$PANDORA_BASE/$DAEMON_NAME"
-DAEMON_ARGS="celeryd -Q default -n pandora-tasks -f /var/log/pandora/pandora-tasks.log -l INFO"
+DAEMON_ARGS="celeryd -Q default,celery -n pandora-tasks -f /var/log/pandora/pandora-tasks.log -l INFO"
 PIDFILE=/var/run/$NAME.pid
 SCRIPTNAME=/etc/init.d/$NAME
 
diff --git a/etc/init/pandora-tasks.conf b/etc/init/pandora-tasks.conf
index d5f58c84..bf4a004d 100644
--- a/etc/init/pandora-tasks.conf
+++ b/etc/init/pandora-tasks.conf
@@ -17,7 +17,7 @@ test -e /var/log/pandora || (mkdir -p /var/log/pandora && chown $USER:$USER /var
 test -e /var/run/pandora || (mkdir -p /var/run/pandora && chown $USER:$USER /var/run/pandora)
 cd $VENV/pandora
 exec /usr/bin/sudo -u $USER $VENV/bin/python $VENV/pandora/manage.py celeryd \
-                   -Q default \
+                   -Q default,celery \
                    -n pandora-default \
                    --pidfile /var/run/pandora/pandora-tasks.pid \
                    -f /var/log/pandora/pandora-tasks.log \
diff --git a/pandora/item/tasks.py b/pandora/item/tasks.py
index 1cd5ca11..b23b0837 100644
--- a/pandora/item/tasks.py
+++ b/pandora/item/tasks.py
@@ -14,7 +14,7 @@ from celery.task import task, periodic_task
 import models
 
 
-@periodic_task(run_every=timedelta(days=1))
+@periodic_task(run_every=timedelta(days=1), queue='encoding')
 def cronjob(**kwargs):
     update_random_sort()
     update_random_clip_sort()