diff --git a/lib/nvmf/ctrlr_discovery.c b/lib/nvmf/ctrlr_discovery.c
index c331ef7ae..16ebd84ea 100644
--- a/lib/nvmf/ctrlr_discovery.c
+++ b/lib/nvmf/ctrlr_discovery.c
@@ -48,8 +48,8 @@
 #include "spdk/bdev_module.h"
 #include "spdk_internal/log.h"
 
-static void
-nvmf_update_discovery_log(struct spdk_nvmf_tgt *tgt, const char *hostnqn)
+static struct spdk_nvmf_discovery_log_page *
+nvmf_generate_discovery_log(struct spdk_nvmf_tgt *tgt, const char *hostnqn, size_t *log_page_size)
 {
 	uint64_t numrec = 0;
 	struct spdk_nvmf_subsystem *subsystem;
@@ -66,7 +66,7 @@ nvmf_update_discovery_log(struct spdk_nvmf_tgt *tgt, const char *hostnqn)
 	disc_log = calloc(1, cur_size);
 	if (disc_log == NULL) {
 		SPDK_ERRLOG("Discovery log page memory allocation error\n");
-		return;
+		return NULL;
 	}
 
 	for (sid = 0; sid < tgt->max_subsystems; sid++) {
@@ -114,11 +114,9 @@ nvmf_update_discovery_log(struct spdk_nvmf_tgt *tgt, const char *hostnqn)
 
 	disc_log->numrec = numrec;
 	disc_log->genctr = tgt->discovery_genctr;
+	*log_page_size = cur_size;
 
-	free(tgt->discovery_log_page);
-
-	tgt->discovery_log_page = disc_log;
-	tgt->discovery_log_page_size = cur_size;
+	return disc_log;
 }
 
 void
@@ -128,24 +126,23 @@ spdk_nvmf_get_discovery_log_page(struct spdk_nvmf_tgt *tgt, const char *hostnqn,
 	size_t copy_len = 0;
 	size_t zero_len = 0;
 	struct iovec *tmp;
+	size_t log_page_size = 0;
+	struct spdk_nvmf_discovery_log_page *discovery_log_page;
 
-	if (offset == 0 || tgt->discovery_log_page == NULL ||
-	    tgt->discovery_log_page->genctr != tgt->discovery_genctr) {
-		nvmf_update_discovery_log(tgt, hostnqn);
-	}
+	discovery_log_page = nvmf_generate_discovery_log(tgt, hostnqn, &log_page_size);
 
 	/* Copy the valid part of the discovery log page, if any */
-	if (tgt->discovery_log_page) {
+	if (discovery_log_page) {
 		for (tmp = iov; tmp < iov + iovcnt; tmp++) {
 			copy_len = spdk_min(tmp->iov_len, length);
-			copy_len = spdk_min(tgt->discovery_log_page_size - offset, copy_len);
+			copy_len = spdk_min(log_page_size - offset, copy_len);
 
-			memcpy(tmp->iov_base, (char *)tgt->discovery_log_page + offset, copy_len);
+			memcpy(tmp->iov_base, (char *)discovery_log_page + offset, copy_len);
 
 			offset += copy_len;
 			length -= copy_len;
 			zero_len = tmp->iov_len - copy_len;
-			if (tgt->discovery_log_page_size <= offset || length == 0) {
+			if (log_page_size <= offset || length == 0) {
 				break;
 			}
 		}
@@ -157,5 +154,7 @@ spdk_nvmf_get_discovery_log_page(struct spdk_nvmf_tgt *tgt, const char *hostnqn,
 		for (++tmp; tmp < iov + iovcnt; tmp++) {
 			memset((char *)tmp->iov_base, 0, tmp->iov_len);
 		}
+
+		free(discovery_log_page);
 	}
 }
diff --git a/lib/nvmf/nvmf.c b/lib/nvmf/nvmf.c
index b0c628dbf..5edc4009f 100644
--- a/lib/nvmf/nvmf.c
+++ b/lib/nvmf/nvmf.c
@@ -233,8 +233,6 @@ spdk_nvmf_tgt_create(uint32_t max_subsystems)
 	}
 
 	tgt->discovery_genctr = 0;
-	tgt->discovery_log_page = NULL;
-	tgt->discovery_log_page_size = 0;
 	TAILQ_INIT(&tgt->transports);
 
 	tgt->subsystems = calloc(tgt->max_subsystems, sizeof(struct spdk_nvmf_subsystem *));
@@ -261,10 +259,6 @@ spdk_nvmf_tgt_destroy_cb(void *io_device)
 	void					*destroy_cb_arg;
 	uint32_t i;
 
-	if (tgt->discovery_log_page) {
-		free(tgt->discovery_log_page);
-	}
-
 	if (tgt->subsystems) {
 		for (i = 0; i < tgt->max_subsystems; i++) {
 			if (tgt->subsystems[i]) {
diff --git a/lib/nvmf/nvmf_internal.h b/lib/nvmf/nvmf_internal.h
index 200583031..d0b9f352d 100644
--- a/lib/nvmf/nvmf_internal.h
+++ b/lib/nvmf/nvmf_internal.h
@@ -81,8 +81,6 @@ struct spdk_nvmf_tgt {
 	/* Array of subsystem pointers of size max_subsystems indexed by sid */
 	struct spdk_nvmf_subsystem		**subsystems;
 
-	struct spdk_nvmf_discovery_log_page	*discovery_log_page;
-	size_t					discovery_log_page_size;
 	TAILQ_HEAD(, spdk_nvmf_transport)	transports;
 
 	spdk_nvmf_tgt_destroy_done_fn		*destroy_cb_fn;
diff --git a/test/unit/lib/nvmf/ctrlr_discovery.c/ctrlr_discovery_ut.c b/test/unit/lib/nvmf/ctrlr_discovery.c/ctrlr_discovery_ut.c
index 8f4fa1c15..2e145528b 100644
--- a/test/unit/lib/nvmf/ctrlr_discovery.c/ctrlr_discovery_ut.c
+++ b/test/unit/lib/nvmf/ctrlr_discovery.c/ctrlr_discovery_ut.c
@@ -274,7 +274,6 @@ test_discovery_log(void)
 	subsystem->state = SPDK_NVMF_SUBSYSTEM_INACTIVE;
 	spdk_nvmf_subsystem_destroy(subsystem);
 	free(tgt.subsystems);
-	free(tgt.discovery_log_page);
 }
 
 int main(int argc, char **argv)