diff --git a/Streaming.cpp b/Streaming.cpp
index b338c8c6..d5e3fbcd 100644
--- a/Streaming.cpp
+++ b/Streaming.cpp
@@ -284,9 +284,11 @@ namespace stream
 	{		
 		const I2NPMessage * leaseSet = nullptr;
 
-		leaseSet = m_LocalDestination->GetLeaseSet ();
-		if (!leaseSet)
-			return false;
+		if (m_LeaseSetUpdated)
+		{	
+			leaseSet = m_LocalDestination->GetLeaseSet ();
+			m_LeaseSetUpdated = false;
+		}	
 
 		I2NPMessage * msg = i2p::garlic::routing.WrapMessage (m_RemoteLeaseSet, 
 			CreateDataMessage (this, buf, len), leaseSet);