diff --git a/contrib/pg_tde/src/encryption/enc_aes.c b/contrib/pg_tde/src/encryption/enc_aes.c
index 84a95a1a323ec..d8b649407b5a0 100644
--- a/contrib/pg_tde/src/encryption/enc_aes.c
+++ b/contrib/pg_tde/src/encryption/enc_aes.c
@@ -48,18 +48,12 @@ static const EVP_CIPHER *cipher_ctr_ecb = NULL;
 void
 AesInit(void)
 {
-	static bool initialized = false;
-
-	Assert(!initialized);
-
 	OpenSSL_add_all_algorithms();
 	ERR_load_crypto_strings();
 
 	cipher_cbc = EVP_aes_128_cbc();
 	cipher_gcm = EVP_aes_128_gcm();
 	cipher_ctr_ecb = EVP_aes_128_ecb();
-
-	initialized = true;
 }
 
 static void
diff --git a/contrib/pg_tde/src/keyring/keyring_kmip.c b/contrib/pg_tde/src/keyring/keyring_kmip.c
index 3b2f4d72bd533..bcec54258187b 100644
--- a/contrib/pg_tde/src/keyring/keyring_kmip.c
+++ b/contrib/pg_tde/src/keyring/keyring_kmip.c
@@ -103,11 +103,9 @@ set_key_by_name(GenericKeyring *keyring, KeyInfo *key)
 {
 	KmipCtx		ctx;
 	KmipKeyring *kmip_keyring = (KmipKeyring *) keyring;
-	bool		sslresult;
 	int			result;
 
-	sslresult = kmipSslConnect(&ctx, kmip_keyring, true);
-	Assert(sslresult);
+	kmipSslConnect(&ctx, kmip_keyring, true);
 
 	result = pg_tde_kmip_set_by_name(ctx.bio, key->name, key->data.data, key->data.len);