diff --git a/libi2pd/ECIESX25519AEADRatchetSession.cpp b/libi2pd/ECIESX25519AEADRatchetSession.cpp
index 18e1c7b6..9781a70a 100644
--- a/libi2pd/ECIESX25519AEADRatchetSession.cpp
+++ b/libi2pd/ECIESX25519AEADRatchetSession.cpp
@@ -685,7 +685,10 @@ namespace garlic
 		if (first) payloadLen += 7;// datatime 
         if (msg && m_Destination) 
             payloadLen += msg->GetPayloadLength () + 13 + 32;
-        auto leaseSet = (GetLeaseSetUpdateStatus () == eLeaseSetUpdated) ? GetOwner ()->GetLeaseSet () : nullptr;
+		auto leaseSet = (GetLeaseSetUpdateStatus () == eLeaseSetUpdated ||
+			(GetLeaseSetUpdateStatus () == eLeaseSetSubmitted && 
+		    	ts > GetLeaseSetSubmissionTime () + LEASET_CONFIRMATION_TIMEOUT)) ?
+			GetOwner ()->GetLeaseSet () : nullptr;
 		if (leaseSet)
 		{	
             payloadLen += leaseSet->GetBufferLen () + DATABASE_STORE_HEADER_SIZE + 13;