diff --git a/lib/nvmf/nvmf_internal.h b/lib/nvmf/nvmf_internal.h
index 7d24f7d3a..a44e4e4e6 100644
--- a/lib/nvmf/nvmf_internal.h
+++ b/lib/nvmf/nvmf_internal.h
@@ -159,6 +159,7 @@ struct spdk_nvmf_request {
 };
 
 struct spdk_nvmf_ns {
+	uint32_t nsid;
 	struct spdk_nvmf_subsystem *subsystem;
 	struct spdk_bdev *bdev;
 	struct spdk_bdev_desc *desc;
diff --git a/lib/nvmf/subsystem.c b/lib/nvmf/subsystem.c
index fa9ae5faa..4011fd647 100644
--- a/lib/nvmf/subsystem.c
+++ b/lib/nvmf/subsystem.c
@@ -1084,6 +1084,7 @@ spdk_nvmf_subsystem_add_ns(struct spdk_nvmf_subsystem *subsystem, struct spdk_bd
 		return 0;
 	}
 	subsystem->ns[opts.nsid - 1] = ns;
+	ns->nsid = opts.nsid;
 
 	SPDK_DEBUGLOG(SPDK_LOG_NVMF, "Subsystem %s: bdev %s assigned nsid %" PRIu32 "\n",
 		      spdk_nvmf_subsystem_get_nqn(subsystem),