diff --git a/libi2pd/ECIESX25519AEADRatchetSession.cpp b/libi2pd/ECIESX25519AEADRatchetSession.cpp
index 2cea2172..5dd78747 100644
--- a/libi2pd/ECIESX25519AEADRatchetSession.cpp
+++ b/libi2pd/ECIESX25519AEADRatchetSession.cpp
@@ -402,8 +402,7 @@ namespace garlic
 			return false;
 		}	
 		HandlePayload (payload.data (), len - 16); 
-		if (m_NumReceiveTags > 0)m_NumReceiveTags--;
-		if (m_NumReceiveTags <= GetOwner ()->GetNumTags ()*2/3)
+		if (m_ReceiveTagset.GetNextIndex () - index <= GetOwner ()->GetNumTags ()*2/3)
 			GenerateMoreReceiveTags (GetOwner ()->GetNumTags ());		
 		return true;
 	}
@@ -570,7 +569,6 @@ namespace garlic
 			uint64_t tag = m_ReceiveTagset.GetNextSessionTag ();
 			GetOwner ()->AddECIESx25519SessionTag (index, tag, shared_from_this ());
 		}	
-		m_NumReceiveTags += numTags;	
 	}	
 
 	bool ECIESX25519AEADRatchetSession::CheckExpired (uint64_t ts)
diff --git a/libi2pd/ECIESX25519AEADRatchetSession.h b/libi2pd/ECIESX25519AEADRatchetSession.h
index db9807a5..95875013 100644
--- a/libi2pd/ECIESX25519AEADRatchetSession.h
+++ b/libi2pd/ECIESX25519AEADRatchetSession.h
@@ -119,7 +119,6 @@ namespace garlic
             SessionState m_State = eSessionStateNew;
 			uint64_t m_LastActivityTimestamp = 0; // incoming
             RatchetTagSet m_SendTagset, m_ReceiveTagset;
-			int m_NumReceiveTags = 0;
 			std::unique_ptr<i2p::data::IdentHash> m_Destination;// TODO: might not need it 
     };
 }