diff --git a/ceph-remove-osd.groovy b/ceph-remove-osd.groovy
index 0a9d4cc..015dcd2 100644
--- a/ceph-remove-osd.groovy
+++ b/ceph-remove-osd.groovy
@@ -201,6 +201,9 @@
                         if (data_partition_uuid?.trim()) {
                             ceph.removePartition(pepperEnv, HOST, data_partition_uuid, 'data', id)
                         }
+                        else {
+                            ceph.removePartition(pepperEnv, HOST, osd_fsid, 'data', id)
+                        }
                     }
                 }
             }