diff --git a/include/spdk/nvme_spec.h b/include/spdk/nvme_spec.h
index ca91c8bc1..87c327903 100644
--- a/include/spdk/nvme_spec.h
+++ b/include/spdk/nvme_spec.h
@@ -712,13 +712,14 @@ union spdk_nvme_feat_async_event_configuration {
 	uint32_t raw;
 	struct {
 		union spdk_nvme_critical_warning_state crit_warn;
-		uint32_t ns_attr_notice		: 1;
-		uint32_t fw_activation_notice	: 1;
-		uint32_t telemetry_log_notice	: 1;
-		uint32_t ana_change_notice	: 1;
-		uint32_t reserved		: 19;
+		uint8_t ns_attr_notice		: 1;
+		uint8_t fw_activation_notice	: 1;
+		uint8_t telemetry_log_notice	: 1;
+		uint8_t ana_change_notice	: 1;
+		uint8_t reserved1		: 4;
+		uint16_t reserved2		: 15;
 		/** Discovery log change (refer to the NVMe over Fabrics specification) */
-		uint32_t discovery_log_change_notice	: 1;
+		uint16_t discovery_log_change_notice	: 1;
 	} bits;
 };
 SPDK_STATIC_ASSERT(sizeof(union spdk_nvme_feat_async_event_configuration) == 4, "Incorrect size");
diff --git a/lib/nvmf/ctrlr.c b/lib/nvmf/ctrlr.c
index 29fa29e3c..252881baa 100644
--- a/lib/nvmf/ctrlr.c
+++ b/lib/nvmf/ctrlr.c
@@ -1655,7 +1655,8 @@ nvmf_ctrlr_set_features_async_event_configuration(struct spdk_nvmf_request *req)
 	SPDK_DEBUGLOG(nvmf, "Set Features - Async Event Configuration, cdw11 0x%08x\n",
 		      cmd->cdw11);
 	ctrlr->feat.async_event_configuration.raw = cmd->cdw11;
-	ctrlr->feat.async_event_configuration.bits.reserved = 0;
+	ctrlr->feat.async_event_configuration.bits.reserved1 = 0;
+	ctrlr->feat.async_event_configuration.bits.reserved2 = 0;
 	return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;
 }