diff --git a/playbooks/roles/zuul-scheduler/handlers/main.yaml b/playbooks/roles/zuul-scheduler/handlers/main.yaml
index 5a70b4c1ee..185979bf89 100644
--- a/playbooks/roles/zuul-scheduler/handlers/main.yaml
+++ b/playbooks/roles/zuul-scheduler/handlers/main.yaml
@@ -2,5 +2,5 @@
   shell:
     cmd: docker-compose exec -T scheduler zuul-scheduler smart-reconfigure
     chdir: /etc/zuul-scheduler
-  # Don't run a restart if we're starting zuul with the playbook
-  when: not zuul_scheduler_start|bool
+  # Don't run a reconfigure if we're starting zuul with the playbook
+  when: zuul_scheduler_start is not defined or not zuul_scheduler_start|bool
diff --git a/playbooks/roles/zuul-scheduler/tasks/main.yaml b/playbooks/roles/zuul-scheduler/tasks/main.yaml
index 592f314044..86254bc82b 100644
--- a/playbooks/roles/zuul-scheduler/tasks/main.yaml
+++ b/playbooks/roles/zuul-scheduler/tasks/main.yaml
@@ -70,4 +70,4 @@
 
 - name: Start containers
   include_tasks: start.yaml
-  when: zuul_scheduler_start | bool
+  when: zuul_scheduler_start is defined and zuul_scheduler_start | bool