diff --git a/libi2pd/Destination.cpp b/libi2pd/Destination.cpp
index 28b23950..01ff2d2a 100644
--- a/libi2pd/Destination.cpp
+++ b/libi2pd/Destination.cpp
@@ -588,9 +588,12 @@ namespace client
 			i2p::garlic::GarlicDestination::HandleDeliveryStatusMessage (msgID);
 	}
 
-	void LeaseSetDestination::SetLeaseSetUpdated ()
+	void LeaseSetDestination::SetLeaseSetUpdated (bool post)
 	{
-		UpdateLeaseSet ();
+		if (post)
+			m_Service.post([s = shared_from_this ()]() { s->UpdateLeaseSet (); });
+		else	
+			UpdateLeaseSet ();
 	}
 
 	void LeaseSetDestination::Publish ()
diff --git a/libi2pd/Destination.h b/libi2pd/Destination.h
index 4a51a257..293cd75d 100644
--- a/libi2pd/Destination.h
+++ b/libi2pd/Destination.h
@@ -150,7 +150,7 @@ namespace client
 			void SubmitECIESx25519Key (const uint8_t * key, uint64_t tag);
 			void ProcessGarlicMessage (std::shared_ptr<I2NPMessage> msg);
 			void ProcessDeliveryStatusMessage (std::shared_ptr<I2NPMessage> msg);
-			void SetLeaseSetUpdated ();
+			void SetLeaseSetUpdated (bool post) override;
 
 			bool IsPublic () const { return m_IsPublic; };
 			void SetPublic (bool pub) { m_IsPublic = pub; };
diff --git a/libi2pd/Garlic.cpp b/libi2pd/Garlic.cpp
index 1705b03a..04884acd 100644
--- a/libi2pd/Garlic.cpp
+++ b/libi2pd/Garlic.cpp
@@ -897,7 +897,7 @@ namespace garlic
 		}
 	}
 
-	void GarlicDestination::SetLeaseSetUpdated ()
+	void GarlicDestination::SetLeaseSetUpdated (bool post)
 	{
 		{
 			std::unique_lock<std::mutex> l(m_SessionsMutex);
diff --git a/libi2pd/Garlic.h b/libi2pd/Garlic.h
index a4475dc7..80fc15da 100644
--- a/libi2pd/Garlic.h
+++ b/libi2pd/Garlic.h
@@ -253,7 +253,7 @@ namespace garlic
 
 			virtual void ProcessGarlicMessage (std::shared_ptr<I2NPMessage> msg);
 			virtual void ProcessDeliveryStatusMessage (std::shared_ptr<I2NPMessage> msg);
-			virtual void SetLeaseSetUpdated ();
+			virtual void SetLeaseSetUpdated (bool post = false);
 
 			virtual std::shared_ptr<const i2p::data::LocalLeaseSet> GetLeaseSet () = 0; // TODO
 			virtual std::shared_ptr<i2p::tunnel::TunnelPool> GetTunnelPool () const = 0;
diff --git a/libi2pd/Tunnel.cpp b/libi2pd/Tunnel.cpp
index 6e5ebdad..c41bb775 100644
--- a/libi2pd/Tunnel.cpp
+++ b/libi2pd/Tunnel.cpp
@@ -259,7 +259,7 @@ namespace tunnel
 			{
 				// update LeaseSet
 				auto dest = pool->GetLocalDestination ();
-				if (dest) dest->SetLeaseSetUpdated ();
+				if (dest) dest->SetLeaseSetUpdated (true);
 			}	
 		}	
 		EncryptTunnelMsg (msg, msg);