diff --git a/Destination.cpp b/Destination.cpp
index dbdec0c7..a1e1858e 100644
--- a/Destination.cpp
+++ b/Destination.cpp
@@ -171,7 +171,7 @@ namespace client
   
 	std::shared_ptr<const i2p::data::LeaseSet> LeaseSetDestination::FindLeaseSet (const i2p::data::IdentHash& ident)
 	{
-		std::unique_lock<std::mutex> lock(m_RemoteLeaseSetsMutex);
+		std::lock_guard<std::mutex> lock(m_RemoteLeaseSetsMutex);
 		auto it = m_RemoteLeaseSets.find (ident);
 		if (it != m_RemoteLeaseSets.end ())
 		{
@@ -185,7 +185,10 @@ namespace client
 						if(ls && !ls->IsExpired())
 						{
 							ls->PopulateLeases();
-							m_RemoteLeaseSets[ident] = ls;
+							{
+								std::lock_guard<std::mutex> l(m_RemoteLeaseSetsMutex);
+								m_RemoteLeaseSets[ident] = ls;
+							}
 						}
 					});
 				}