diff --git a/Maintenance/maint-reboot-required.yaml b/Maintenance/maint-reboot-required.yaml
index 9af32c8..af79c59 100644
--- a/Maintenance/maint-reboot-required.yaml
+++ b/Maintenance/maint-reboot-required.yaml
@@ -36,7 +36,7 @@
               {% for host in ansible_play_hosts_all %}
               {
                 "name": "{{ host }}",
-                "value": "{% if hostvars[host]['reboot']['stat']['exists'] %}&#U+2705 Rebooted{% else %}Not Rebooted{% endif %}"
+                "value": "{% if host in groups.all | select('defined', 'eboot') | selectattr('reboot.stat.exists') %}&#U+2705 Rebooted{% else %}Not Rebooted{% endif %}"
               }{% if not loop.last %},{% endif %}
               {% endfor %}
             ]