diff --git a/ceph-remove-node.groovy b/ceph-remove-node.groovy
index 3a13e42..4124ce4 100644
--- a/ceph-remove-node.groovy
+++ b/ceph-remove-node.groovy
@@ -63,8 +63,8 @@
                         throw new Exception("Ceph salt grains cannot be found on $HOST")
                     }
 
-                    // glob for OSD input
-                    if(OSD == '*') {
+                    // glob for OSD input or whole node is going to be removed
+                    if(OSD == '*' || !osdOnly) {
                         osds = cephDisks
                     }