diff --git a/fabrics.c b/fabrics.c
index 4f78bf9d70..b2beaeb0b8 100644
--- a/fabrics.c
+++ b/fabrics.c
@@ -370,6 +370,11 @@ static int create_common_context(struct nvme_global_ctx *ctx,
 	if (err)
 		goto err;
 
+	err = nvmf_context_set_crypto(fctx, fa->hostkey, fa->ctrlkey,
+		fa->keyring, fa->tls_key, fa->tls_key_identity);
+	if (err)
+		goto err;
+
 	err = nvmf_context_set_persistent(fctx, persistent);
 	if (err)
 		goto err;
diff --git a/libnvme/src/nvme/linux.c b/libnvme/src/nvme/linux.c
index 8149e21bf4..4f56e16b48 100644
--- a/libnvme/src/nvme/linux.c
+++ b/libnvme/src/nvme/linux.c
@@ -1813,7 +1813,7 @@ int __nvme_import_keys_from_config(nvme_host_t h, nvme_ctrl_t c,
 	identity = nvme_ctrl_get_tls_key_identity(c);
 	if (identity) {
 		ret = nvme_lookup_key("psk", identity, &id);
-		if (ret) {
+		if (ret && !(ret == -ENOKEY || ret == -EKEYREVOKED)) {
 			nvme_msg(h->ctx, LOG_ERR,
 				 "Failed to lookup key for identity %s, error %d\n",
 				  identity, ret);