diff --git a/libi2pd_client/I2CP.cpp b/libi2pd_client/I2CP.cpp
index b18f7e7c..153e98af 100644
--- a/libi2pd_client/I2CP.cpp
+++ b/libi2pd_client/I2CP.cpp
@@ -287,6 +287,11 @@ namespace client
 
 	void I2CPSession::Start ()
 	{
+		if (m_Socket)
+		{	
+			m_Socket->set_option (boost::asio::socket_base::receive_buffer_size (I2CP_MAX_MESSAGE_LENGTH));
+			m_Socket->set_option (boost::asio::socket_base::send_buffer_size (I2CP_MAX_MESSAGE_LENGTH));
+		}	
 		ReadProtocolByte ();
 	}