diff --git a/fabrics.c b/fabrics.c
index d22213bd27..4f78bf9d70 100644
--- a/fabrics.c
+++ b/fabrics.c
@@ -362,6 +362,10 @@ static int create_common_context(struct nvme_global_ctx *ctx,
 	if (err)
 		goto err;
 
+	err = nvmf_context_set_hostnqn(fctx, fa->hostnqn, fa->hostid);
+	if (err)
+		goto err;
+
 	err = nvmf_context_set_fabrics_config(fctx, cfg);
 	if (err)
 		goto err;
diff --git a/libnvme/src/nvme/fabrics.c b/libnvme/src/nvme/fabrics.c
index 6e8393a529..8ad16391f5 100644
--- a/libnvme/src/nvme/fabrics.c
+++ b/libnvme/src/nvme/fabrics.c
@@ -270,7 +270,8 @@ int nvmf_context_set_connection(struct nvmf_context *fctx,
 	fctx->transport = transport;
 	fctx->traddr = traddr;
 	fctx->trsvcid = trsvcid;
-	fctx->host_traddr = host_iface;
+	fctx->host_traddr = host_traddr;
+	fctx->host_iface = host_iface;
 
 	return 0;
 }