diff --git a/libi2pd_client/I2CP.cpp b/libi2pd_client/I2CP.cpp
index 7c59c5c6..d592cc7e 100644
--- a/libi2pd_client/I2CP.cpp
+++ b/libi2pd_client/I2CP.cpp
@@ -298,6 +298,12 @@ namespace client
 		m_Owner->SendMessageStatusMessage (nonce, eI2CPMessageStatusGuaranteedSuccess);
 		return sent;
 	}
+
+	void I2CPDestination::CleanupDestination ()
+	{
+		m_I2NPMsgsPool.CleanUpMt ();
+		if (m_Owner) m_Owner->CleanupRoutingSessions ();
+	}	
 		
 	RunnableI2CPDestination::RunnableI2CPDestination (std::shared_ptr<I2CPSession> owner,
 		std::shared_ptr<const i2p::data::IdentityEx> identity, bool isPublic, const std::map<std::string, std::string>& params):
@@ -756,6 +762,18 @@ namespace client
 		std::lock_guard<std::mutex> l(m_RoutingSessionsMutex);
 		m_RoutingSessions[signingKey] = remoteSession;
 	}
+
+	void I2CPSession::CleanupRoutingSessions ()
+	{
+		std::lock_guard<std::mutex> l(m_RoutingSessionsMutex);
+		for (auto it = m_RoutingSessions.begin (); it != m_RoutingSessions.end ();)
+		{
+			if (it->second->IsTerminated ())
+				it = m_RoutingSessions.erase (it);
+			else	
+				it++;
+		}	
+	}	
 		
 	void I2CPSession::CreateLeaseSetMessageHandler (const uint8_t * buf, size_t len)
 	{
diff --git a/libi2pd_client/I2CP.h b/libi2pd_client/I2CP.h
index 91d567fb..98adbf0e 100644
--- a/libi2pd_client/I2CP.h
+++ b/libi2pd_client/I2CP.h
@@ -104,6 +104,7 @@ namespace client
 
 		protected:
 
+			void CleanupDestination ();
 			// I2CP
 			void HandleDataMessage (const uint8_t * buf, size_t len);
 			void CreateNewLeaseSet (const std::vector<std::shared_ptr<i2p::tunnel::InboundTunnel> >& tunnels);
@@ -163,6 +164,7 @@ namespace client
 			void SendMessagePayloadMessage (const uint8_t * payload, size_t len);
 			void SendMessageStatusMessage (uint32_t nonce, I2CPMessageStatus status);
 			void AddRoutingSession (const i2p::data::IdentHash& signingKey, std::shared_ptr<i2p::garlic::GarlicRoutingSession> remoteSession);
+			void CleanupRoutingSessions ();
 
 			// message handlers
 			void GetDateMessageHandler (const uint8_t * buf, size_t len);