diff --git a/ceph-osd-create-start b/ceph-osd-create-start
index a2c73f7..c2612b0 100755
--- a/ceph-osd-create-start
+++ b/ceph-osd-create-start
@@ -94,6 +94,9 @@ else
 fi
 
 ceph osd crush add osd.${osd_id} ${WEIGHT} host=$(hostname)
+
+# Ensure previous assigned class is gone
+ceph osd crush rm-device-class osd.${osd_id}
 ceph osd crush set-device-class $CLASS osd.${osd_id}
 
 echo "$metadata_dev /var/lib/ceph/osd/ceph-${osd_id} xfs noatime 0 0" >> /etc/fstab