diff --git a/libi2pd/SSUData.cpp b/libi2pd/SSUData.cpp
index 18b471e2..6bf01778 100644
--- a/libi2pd/SSUData.cpp
+++ b/libi2pd/SSUData.cpp
@@ -176,7 +176,8 @@ namespace transport
 			if (it == m_IncompleteMessages.end ())
 			{
 				// create new message
-				auto msg = NewI2NPShortMessage ();
+				auto msg = (!fragmentNum && fragmentSize > 0 && buf[I2NP_SHORT_HEADER_TYPEID_OFFSET] == eI2NPTunnelData) ?
+					NewI2NPTunnelMessage (true) : NewI2NPShortMessage ();
 				msg->len -= I2NP_SHORT_HEADER_SIZE;
 				it = m_IncompleteMessages.insert (std::make_pair (msgID,
 					m_Session.GetServer ().GetIncompleteMessagesPool ().AcquireShared (msg))).first;