diff --git a/lib/nvme/nvme_ctrlr.c b/lib/nvme/nvme_ctrlr.c
index 4c86b4bff..b05c46d1b 100644
--- a/lib/nvme/nvme_ctrlr.c
+++ b/lib/nvme/nvme_ctrlr.c
@@ -797,12 +797,6 @@ nvme_ctrlr_set_supported_log_pages(struct spdk_nvme_ctrlr *ctrlr)
 			nvme_ctrlr_parse_ana_log_page(ctrlr, nvme_ctrlr_update_ns_ana_states,
 						      ctrlr);
 		}
-	} else {
-		uint32_t i;
-
-		for (i = 0; i < ctrlr->num_ns; i++) {
-			ctrlr->ns[i].ana_state = SPDK_NVME_ANA_OPTIMIZED_STATE;
-		}
 	}
 
 out:
diff --git a/lib/nvme/nvme_ns.c b/lib/nvme/nvme_ns.c
index c4dd2b279..f03d69388 100644
--- a/lib/nvme/nvme_ns.c
+++ b/lib/nvme/nvme_ns.c
@@ -529,6 +529,8 @@ int nvme_ns_construct(struct spdk_nvme_ns *ns, uint32_t id,
 
 	ns->ctrlr = ctrlr;
 	ns->id = id;
+	/* This will be overwritten when reading ANA log page. */
+	ns->ana_state = SPDK_NVME_ANA_OPTIMIZED_STATE;
 
 	rc = nvme_ctrlr_identify_ns(ns);
 	if (rc != 0) {