diff --git a/module/bdev/nvme/bdev_nvme.c b/module/bdev/nvme/bdev_nvme.c
index 8907dda87..5f67e9387 100644
--- a/module/bdev/nvme/bdev_nvme.c
+++ b/module/bdev/nvme/bdev_nvme.c
@@ -1148,7 +1148,8 @@ nvme_bdev_create(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr, struct nvme_bdev_ns *n
 		}
 	}
 
-	if (!bdev_nvme_io_type_supported(bdev, SPDK_BDEV_IO_TYPE_COMPARE_AND_WRITE)) {
+	if (!(spdk_nvme_ctrlr_get_flags(ctrlr) &
+	      SPDK_NVME_CTRLR_COMPARE_AND_WRITE_SUPPORTED)) {
 		bdev->disk.acwu = 0;
 	} else if (nsdata->nsfeat.ns_atomic_write_unit) {
 		bdev->disk.acwu = nsdata->nacwu;