diff --git a/libi2pd/Signature.cpp b/libi2pd/Signature.cpp
index 88ee4060..28ae5fa6 100644
--- a/libi2pd/Signature.cpp
+++ b/libi2pd/Signature.cpp
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2013-2020, The PurpleI2P Project
+* Copyright (c) 2013-2021, The PurpleI2P Project
 *
 * This file is part of Purple i2pd project and licensed under BSD3
 *
@@ -15,8 +15,7 @@ namespace i2p
 namespace crypto
 {
 #if OPENSSL_EDDSA
-	EDDSA25519Verifier::EDDSA25519Verifier ():
-		m_Pkey (nullptr)
+	EDDSA25519Verifier::EDDSA25519Verifier ()
 	{
 		m_MDCtx = EVP_MD_CTX_create ();
 	}
@@ -24,13 +23,13 @@ namespace crypto
 	EDDSA25519Verifier::~EDDSA25519Verifier ()
 	{
 		EVP_MD_CTX_destroy (m_MDCtx);
-		if (m_Pkey) EVP_PKEY_free (m_Pkey);
 	}
 
 	void EDDSA25519Verifier::SetPublicKey (const uint8_t * signingKey)
 	{
-		m_Pkey = EVP_PKEY_new_raw_public_key (EVP_PKEY_ED25519, NULL, signingKey, 32);
-		EVP_DigestVerifyInit (m_MDCtx, NULL, NULL, NULL, m_Pkey);
+		EVP_PKEY * pkey = EVP_PKEY_new_raw_public_key (EVP_PKEY_ED25519, NULL, signingKey, 32);
+		EVP_DigestVerifyInit (m_MDCtx, NULL, NULL, NULL, pkey);
+		EVP_PKEY_free (pkey);
 	}
 
 	bool EDDSA25519Verifier::Verify (const uint8_t * buf, size_t len, const uint8_t * signature) const
@@ -100,33 +99,29 @@ namespace crypto
 
 #if OPENSSL_EDDSA
 	EDDSA25519Signer::EDDSA25519Signer (const uint8_t * signingPrivateKey, const uint8_t * signingPublicKey):
-		m_Fallback (nullptr)
+		m_MDCtx (nullptr), m_Fallback (nullptr)
 	{
-		m_Pkey = EVP_PKEY_new_raw_private_key (EVP_PKEY_ED25519, NULL, signingPrivateKey, 32);
+		EVP_PKEY * pkey = EVP_PKEY_new_raw_private_key (EVP_PKEY_ED25519, NULL, signingPrivateKey, 32);
 		uint8_t publicKey[EDDSA25519_PUBLIC_KEY_LENGTH];
 		size_t len = EDDSA25519_PUBLIC_KEY_LENGTH;
-		EVP_PKEY_get_raw_public_key (m_Pkey, publicKey, &len);
+		EVP_PKEY_get_raw_public_key (pkey, publicKey, &len);
 		if (signingPublicKey && memcmp (publicKey, signingPublicKey, EDDSA25519_PUBLIC_KEY_LENGTH))
 		{
 			LogPrint (eLogWarning, "EdDSA public key mismatch. Fallback");
-			EVP_PKEY_free (m_Pkey);
 			m_Fallback = new EDDSA25519SignerCompat (signingPrivateKey, signingPublicKey);
 		}
 		else
 		{
 			m_MDCtx = EVP_MD_CTX_create ();
-			EVP_DigestSignInit (m_MDCtx, NULL, NULL, NULL, m_Pkey);
+			EVP_DigestSignInit (m_MDCtx, NULL, NULL, NULL, pkey);
 		}
+		EVP_PKEY_free (pkey);	
 	}
 
 	EDDSA25519Signer::~EDDSA25519Signer ()
 	{
 		if (m_Fallback) delete m_Fallback;
-		else
-		{
-			EVP_MD_CTX_destroy (m_MDCtx);
-			EVP_PKEY_free (m_Pkey);
-		}
+		EVP_MD_CTX_destroy (m_MDCtx);
 	}
 
 	void EDDSA25519Signer::Sign (const uint8_t * buf, int len, uint8_t * signature) const
diff --git a/libi2pd/Signature.h b/libi2pd/Signature.h
index 18084603..caf9b274 100644
--- a/libi2pd/Signature.h
+++ b/libi2pd/Signature.h
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2013-2020, The PurpleI2P Project
+* Copyright (c) 2013-2021, The PurpleI2P Project
 *
 * This file is part of Purple i2pd project and licensed under BSD3
 *
@@ -304,7 +304,6 @@ namespace crypto
 		private:
 
 #if OPENSSL_EDDSA
-			EVP_PKEY * m_Pkey;
 			EVP_MD_CTX * m_MDCtx;
 #else
 			EDDSAPoint m_PublicKey;
@@ -341,7 +340,7 @@ namespace crypto
 			void Sign (const uint8_t * buf, int len, uint8_t * signature) const;
 
 		private:
-			EVP_PKEY * m_Pkey;
+			
 			EVP_MD_CTX * m_MDCtx;
 			EDDSA25519SignerCompat * m_Fallback;
 	};