diff --git a/ceph-remove-osd.groovy b/ceph-remove-osd.groovy
index 1e62bb2..9f6934e 100644
--- a/ceph-remove-osd.groovy
+++ b/ceph-remove-osd.groovy
@@ -46,7 +46,7 @@
 
     for (i in pillar_disks.keySet()) {
         def osd_id = (hostname_id + i).toInteger()
-        if (osd_id in osds) {
+        if (osd_id in osds || OSD == '*') {
             osd_ids.add('osd.' + osd_id)
         }
     }