diff --git a/libi2pd/ECIESX25519AEADRatchetSession.cpp b/libi2pd/ECIESX25519AEADRatchetSession.cpp
index 7fdf351e..4c7d15ef 100644
--- a/libi2pd/ECIESX25519AEADRatchetSession.cpp
+++ b/libi2pd/ECIESX25519AEADRatchetSession.cpp
@@ -223,16 +223,8 @@ namespace garlic
 			switch (blk)
 			{
 				case eECIESx25519BlkGalicClove:
-					GetOwner ()->HandleECIESx25519GarlicClove (buf + offset, size);
-				break;
-				case eECIESx25519BlkDateTime:
-					LogPrint (eLogDebug, "Garlic: datetime");
-				break;	
-				case eECIESx25519BlkOptions:
-					LogPrint (eLogDebug, "Garlic: options");
-				break;
-				case eECIESx25519BlkPadding:
-					LogPrint (eLogDebug, "Garlic: padding");
+					if (GetOwner ())
+						GetOwner ()->HandleECIESx25519GarlicClove (buf + offset, size);
 				break;
 				case eECIESx25519BlkNextKey:
 					LogPrint (eLogDebug, "Garlic: next key");	
@@ -256,6 +248,21 @@ namespace garlic
 					m_AckRequests.push_back ({receiveTagset->GetTagSetID (), index});		
 					break;	
 				}	
+				case eECIESx25519BlkTermination:
+					LogPrint (eLogDebug, "Garlic: termination");
+					if (GetOwner ())
+						GetOwner ()->RemoveECIESx25519Session (m_RemoteStaticKey);
+					if (receiveTagset) receiveTagset->Expire ();
+				break;	
+				case eECIESx25519BlkDateTime:
+					LogPrint (eLogDebug, "Garlic: datetime");
+				break;	
+				case eECIESx25519BlkOptions:
+					LogPrint (eLogDebug, "Garlic: options");
+				break;
+				case eECIESx25519BlkPadding:
+					LogPrint (eLogDebug, "Garlic: padding");
+				break;	
 				default:
 					LogPrint (eLogWarning, "Garlic: Unknown block type ", (int)blk);
 			}
@@ -852,7 +859,7 @@ namespace garlic
 		CleanupUnconfirmedLeaseSet (ts);
 		return ts > m_LastActivityTimestamp + ECIESX25519_EXPIRATION_TIMEOUT; 
 	}	
-
+		
 	std::shared_ptr<I2NPMessage> WrapECIESX25519AEADRatchetMessage (std::shared_ptr<const I2NPMessage> msg, const uint8_t * key, uint64_t tag)
 	{
 		auto m = NewI2NPMessage ();
diff --git a/libi2pd/ECIESX25519AEADRatchetSession.h b/libi2pd/ECIESX25519AEADRatchetSession.h
index 79e920b5..29d75a6b 100644
--- a/libi2pd/ECIESX25519AEADRatchetSession.h
+++ b/libi2pd/ECIESX25519AEADRatchetSession.h
@@ -21,7 +21,7 @@ namespace garlic
 	const int ECIESX25519_EXPIRATION_TIMEOUT = 480; // in seconds
 	const int ECIESX25519_INCOMING_TAGS_EXPIRATION_TIMEOUT = 600; // in seconds
 	const int ECIESX25519_PREVIOUS_TAGSET_EXPIRATION_TIMEOUT = 180; // 180
-	const int ECIESX25519_TAGSET_MAX_NUM_TAGS = 1024; // number of tags we request new tagset after
+	const int ECIESX25519_TAGSET_MAX_NUM_TAGS = 4096; // number of tags we request new tagset after
 	const int ECIESX25519_MIN_NUM_GENERATED_TAGS = 24;
 	const int ECIESX25519_MAX_NUM_GENERATED_TAGS = 160;
 	const int ECIESX25519_NSR_NUM_GENERATED_TAGS = 12;
@@ -110,7 +110,7 @@ namespace garlic
 
 			bool HandleNextMessage (const uint8_t * buf, size_t len, std::shared_ptr<RatchetTagSet> receiveTagset, int index = 0);
             std::shared_ptr<I2NPMessage> WrapSingleMessage (std::shared_ptr<const I2NPMessage> msg);
-
+			
             const uint8_t * GetRemoteStaticKey () const { return m_RemoteStaticKey; }
 			void SetRemoteStaticKey (const uint8_t * key) { memcpy (m_RemoteStaticKey, key, 32); }
 
diff --git a/libi2pd/Garlic.cpp b/libi2pd/Garlic.cpp
index fb3451d0..8ba4a8a1 100644
--- a/libi2pd/Garlic.cpp
+++ b/libi2pd/Garlic.cpp
@@ -1013,5 +1013,14 @@ namespace garlic
 		m_ECIESx25519Sessions.emplace (staticKeyTag, session);
 	}
 
+	void GarlicDestination::RemoveECIESx25519Session (const uint8_t * staticKey)
+	{
+		auto it = m_ECIESx25519Sessions.find (staticKey);
+		if (it != m_ECIESx25519Sessions.end ())
+		{
+			it->second->SetOwner (nullptr);
+			m_ECIESx25519Sessions.erase (it);
+		}	
+	}	
 }
 }
diff --git a/libi2pd/Garlic.h b/libi2pd/Garlic.h
index 6c81dabf..86c9e432 100644
--- a/libi2pd/Garlic.h
+++ b/libi2pd/Garlic.h
@@ -233,6 +233,7 @@ namespace garlic
 			void DeliveryStatusSent (GarlicRoutingSessionPtr session, uint32_t msgID);
             void AddECIESx25519SessionNextTag (RatchetTagSetPtr tagset);
 			void AddECIESx25519Session (const uint8_t * staticKey, ECIESX25519AEADRatchetSessionPtr session);
+			void RemoveECIESx25519Session (const uint8_t * staticKey);
 			void HandleECIESx25519GarlicClove (const uint8_t * buf, size_t len);
 
 			virtual void ProcessGarlicMessage (std::shared_ptr<I2NPMessage> msg);