diff --git a/tasks/supervisor.yml b/tasks/supervisor.yml
index e23f1c5f..3bd26093 100644
--- a/tasks/supervisor.yml
+++ b/tasks/supervisor.yml
@@ -41,7 +41,7 @@
     src: supervisor/celery_firmware_upgrader.j2
     dest: "{{ supervisor_path | format('celery_firmware_upgrader') }}"
     mode: 0644
-  when: openwisp2_celery_firmware_upgrader
+  when: openwisp2_firmware_upgrader and openwisp2_celery_firmware_upgrader
   notify: reload supervisor
 
 - name: supervisor celerybeat