diff --git a/roles/5-xo-services/tasks/main.yml b/roles/5-xo-services/tasks/main.yml
index e164965f9..94cc58597 100644
--- a/roles/5-xo-services/tasks/main.yml
+++ b/roles/5-xo-services/tasks/main.yml
@@ -7,19 +7,19 @@
 - name: ACTIVITY-SERVER
   include_role:
     name: activity-server
-  when: activity_server_install | bool
+  when: activity_server_install is defined and activity_server_install
 
 # UNMAINTAINED
 - name: EJABBERD_XS
   include_role:
     name: ejabberd_xs
-  when: ejabberd_xs_install | bool
+  when: ejabberd_xs_install is defined and ejabberd_xs_install
 
 # UNMAINTAINED
 - name: IDMGR
   include_role:
     name: idmgr
-  when: idmgr_install | bool
+  when: idmgr_install is defined and idmgr_install
 
 - name: Recording STAGE 5 HAS COMPLETED =====================
   lineinfile: