diff --git a/examples/nvme/identify/identify.c b/examples/nvme/identify/identify.c
index 65d5e500c..d09536d46 100644
--- a/examples/nvme/identify/identify.c
+++ b/examples/nvme/identify/identify.c
@@ -132,7 +132,7 @@ get_health_log_page(struct nvme_controller *ctrlr)
 
 	cmd.opc = NVME_OPC_GET_LOG_PAGE;
 	cmd.cdw10 = NVME_LOG_HEALTH_INFORMATION;
-	cmd.cdw10 |= (sizeof(*health_page) / 4) << 16; // number of dwords
+	cmd.cdw10 |= ((sizeof(*health_page) / 4) - 1) << 16; // number of dwords
 	cmd.nsid = NVME_GLOBAL_NAMESPACE_TAG;
 
 	return nvme_ctrlr_cmd_admin_raw(ctrlr, &cmd, health_page, sizeof(*health_page),
diff --git a/test/lib/nvme/aer/aer.c b/test/lib/nvme/aer/aer.c
index 72e626119..5d08948b7 100644
--- a/test/lib/nvme/aer/aer.c
+++ b/test/lib/nvme/aer/aer.c
@@ -142,7 +142,7 @@ get_health_log_page(struct dev *dev)
 
 	cmd.opc = NVME_OPC_GET_LOG_PAGE;
 	cmd.cdw10 = NVME_LOG_HEALTH_INFORMATION;
-	cmd.cdw10 |= (sizeof(*(dev->health_page)) / 4) << 16; // number of dwords
+	cmd.cdw10 |= ((sizeof(*(dev->health_page)) / 4) - 1) << 16; // number of dwords
 	cmd.nsid = NVME_GLOBAL_NAMESPACE_TAG;
 
 	return nvme_ctrlr_cmd_admin_raw(dev->ctrlr, &cmd, dev->health_page, sizeof(*dev->health_page),