diff --git a/lib/nvme/nvme_pcie.c b/lib/nvme/nvme_pcie.c
index 1e69281d5..194dd87dc 100644
--- a/lib/nvme/nvme_pcie.c
+++ b/lib/nvme/nvme_pcie.c
@@ -813,7 +813,7 @@ static struct spdk_nvme_ctrlr *nvme_pcie_ctrlr_construct(const struct spdk_nvme_
 	struct nvme_pcie_ctrlr *pctrlr;
 	union spdk_nvme_cap_register cap;
 	union spdk_nvme_vs_register vs;
-	uint32_t cmd_reg;
+	uint16_t cmd_reg;
 	int rc;
 	struct spdk_pci_id pci_id;
 
@@ -853,9 +853,9 @@ static struct spdk_nvme_ctrlr *nvme_pcie_ctrlr_construct(const struct spdk_nvme_
 	}
 
 	/* Enable PCI busmaster and disable INTx */
-	spdk_pci_device_cfg_read32(pci_dev, &cmd_reg, 4);
+	spdk_pci_device_cfg_read16(pci_dev, &cmd_reg, 4);
 	cmd_reg |= 0x404;
-	spdk_pci_device_cfg_write32(pci_dev, cmd_reg, 4);
+	spdk_pci_device_cfg_write16(pci_dev, cmd_reg, 4);
 
 	if (nvme_ctrlr_get_cap(&pctrlr->ctrlr, &cap)) {
 		SPDK_ERRLOG("get_cap() failed\n");
diff --git a/test/unit/lib/nvme/nvme_pcie.c/nvme_pcie_ut.c b/test/unit/lib/nvme/nvme_pcie.c/nvme_pcie_ut.c
index 0c5070092..955202a70 100644
--- a/test/unit/lib/nvme/nvme_pcie.c/nvme_pcie_ut.c
+++ b/test/unit/lib/nvme/nvme_pcie.c/nvme_pcie_ut.c
@@ -66,9 +66,9 @@ DEFINE_STUB(spdk_pci_device_attach, int, (struct spdk_pci_driver *driver, spdk_p
 DEFINE_STUB(spdk_pci_device_claim, int, (struct spdk_pci_device *dev), 0);
 DEFINE_STUB_V(spdk_pci_device_unclaim, (struct spdk_pci_device *dev));
 DEFINE_STUB_V(spdk_pci_device_detach, (struct spdk_pci_device *device));
-DEFINE_STUB(spdk_pci_device_cfg_write32, int, (struct spdk_pci_device *dev, uint32_t value,
+DEFINE_STUB(spdk_pci_device_cfg_write16, int, (struct spdk_pci_device *dev, uint16_t value,
 		uint32_t offset), 0);
-DEFINE_STUB(spdk_pci_device_cfg_read32, int, (struct spdk_pci_device *dev, uint32_t *value,
+DEFINE_STUB(spdk_pci_device_cfg_read16, int, (struct spdk_pci_device *dev, uint16_t *value,
 		uint32_t offset), 0);
 DEFINE_STUB(spdk_pci_device_get_id, struct spdk_pci_id, (struct spdk_pci_device *dev), {0})