diff --git a/roles/ceph-validate/tasks/check_devices.yml b/roles/ceph-validate/tasks/check_devices.yml
index 930f45431..5f439ac6a 100644
--- a/roles/ceph-validate/tasks/check_devices.yml
+++ b/roles/ceph-validate/tasks/check_devices.yml
@@ -83,7 +83,7 @@
         unit: MiB
       register: devices_parted
       failed_when: False
-      with_items: "{{ devices | default([]) }}"
+      with_items: "{{ devices }}"
 
     - name: fail if one of the devices is not a device
       fail:
diff --git a/roles/ceph-validate/tasks/main.yml b/roles/ceph-validate/tasks/main.yml
index ae989b0fc..51c2fac28 100644
--- a/roles/ceph-validate/tasks/main.yml
+++ b/roles/ceph-validate/tasks/main.yml
@@ -140,6 +140,7 @@
   when:
     - osd_group_name in group_names
     - not osd_auto_discovery | default(False) | bool
+    - devices|default([])|length > 0
 
 - name: include check_eth_mon.yml
   include_tasks: check_eth_mon.yml