diff --git a/libi2pd/SSU2.cpp b/libi2pd/SSU2.cpp
index 94f8eedb..91676d1b 100644
--- a/libi2pd/SSU2.cpp
+++ b/libi2pd/SSU2.cpp
@@ -597,6 +597,7 @@ namespace transport
 			return false;
 		}	
 		SetRemoteIdentity (ri->GetRouterIdentity ());
+		m_Server.AddSessionByRouterHash (shared_from_this ()); // we know remote router now
 		m_Address = ri->GetSSU2AddressWithStaticKey (S, m_RemoteEndpoint.address ().is_v6 ()); 
 		if (!m_Address)
 		{
@@ -1625,12 +1626,43 @@ namespace transport
 	void SSU2Server::AddSession (std::shared_ptr<SSU2Session> session)
 	{
 		if (session)
+		{	
 			m_Sessions.emplace (session->GetConnID (), session);
+			AddSessionByRouterHash (session);
+		}	
 	}	
 
 	void SSU2Server::RemoveSession (uint64_t connID)
 	{
-		m_Sessions.erase (connID);
+		auto it = m_Sessions.find (connID);
+		if (it != m_Sessions.end ())
+		{	
+			auto ident = it->second->GetRemoteIdentity ();
+			if (ident)
+				m_SessionsByRouterHash.erase (ident->GetIdentHash ());
+			m_Sessions.erase (it);
+		}	
+	}	
+
+	void  SSU2Server::AddSessionByRouterHash (std::shared_ptr<SSU2Session> session)
+	{
+		if (session)
+		{	
+			auto ident = session->GetRemoteIdentity ();
+			if (ident)
+			{
+				auto ret = m_SessionsByRouterHash.emplace (ident->GetIdentHash (), session);
+				if (!ret.second)
+				{
+					// session already exists
+					LogPrint (eLogWarning, "SSU2: Session to ", ident->GetIdentHash ().ToBase64 (), " aready exists");
+					// terminate existing
+					GetService ().post (std::bind (&SSU2Session::Terminate, ret.first->second));
+					// update session
+					ret.first->second = session;
+				}	
+			}	
+		}	
 	}	
 		
 	void SSU2Server::AddPendingOutgoingSession (std::shared_ptr<SSU2Session> session)
diff --git a/libi2pd/SSU2.h b/libi2pd/SSU2.h
index c2ca6fce..ea83b608 100644
--- a/libi2pd/SSU2.h
+++ b/libi2pd/SSU2.h
@@ -255,6 +255,7 @@ namespace transport
 			
 			void AddSession (std::shared_ptr<SSU2Session> session);
 			void RemoveSession (uint64_t connID);
+			void AddSessionByRouterHash (std::shared_ptr<SSU2Session> session);
 			void AddPendingOutgoingSession (std::shared_ptr<SSU2Session> session);
 
 			void AddRelay (uint32_t tag, std::shared_ptr<SSU2Session> relay);
@@ -295,6 +296,7 @@ namespace transport
 			ReceiveService m_ReceiveService; 
 			boost::asio::ip::udp::socket m_SocketV4, m_SocketV6;
 			std::unordered_map<uint64_t, std::shared_ptr<SSU2Session> > m_Sessions;
+			std::map<i2p::data::IdentHash, std::shared_ptr<SSU2Session> > m_SessionsByRouterHash;
 			std::map<boost::asio::ip::udp::endpoint, std::shared_ptr<SSU2Session> > m_PendingOutgoingSessions;
 			std::map<boost::asio::ip::udp::endpoint, std::pair<uint64_t, uint32_t> > m_IncomingTokens, m_OutgoingTokens; // remote endpoint -> (token, expires in seconds)
 			std::map<uint32_t, std::shared_ptr<SSU2Session> > m_Relays; // we are introducer, relay tag -> session