diff --git a/libi2pd/I2NPProtocol.cpp b/libi2pd/I2NPProtocol.cpp
index a03ad7ed..53afbca4 100644
--- a/libi2pd/I2NPProtocol.cpp
+++ b/libi2pd/I2NPProtocol.cpp
@@ -257,7 +257,14 @@ namespace i2p
 		uint8_t * sizePtr = buf;
 		buf += 2;
 		m->len += (buf - payload); // payload size
-		size_t size = i2p::data::GzipNoCompression (router->GetBuffer (), router->GetBufferLen (), buf, m->maxLen -m->len);
+		size_t size = 0;
+		if (router->GetBufferLen () + (buf - payload) <= 940) // fits one tunnel message
+			size = i2p::data::GzipNoCompression (router->GetBuffer (), router->GetBufferLen (), buf, m->maxLen -m->len);
+		else
+		{
+			i2p::data::GzipDeflator deflator;
+			size = deflator.Deflate (router->GetBuffer (), router->GetBufferLen (), buf, m->maxLen -m->len);
+		}		
 		if (size)
 		{
 			htobe16buf (sizePtr, size); // size