diff --git a/libi2pd/I2NPProtocol.h b/libi2pd/I2NPProtocol.h
index 15e3a32c..5160acec 100644
--- a/libi2pd/I2NPProtocol.h
+++ b/libi2pd/I2NPProtocol.h
@@ -75,6 +75,7 @@ namespace i2p
 
 	enum I2NPMessageType
 	{
+		eI2NPDummyMsg = 0,	
 		eI2NPDatabaseStore = 1,
 		eI2NPDatabaseLookup = 2,
 		eI2NPDatabaseSearchReply = 3,
diff --git a/libi2pd/NTCP2.cpp b/libi2pd/NTCP2.cpp
index 8caafd2f..5940e49a 100644
--- a/libi2pd/NTCP2.cpp
+++ b/libi2pd/NTCP2.cpp
@@ -695,8 +695,7 @@ namespace transport
 						SendTerminationAndTerminate (eNTCP2IncorrectSParameter);				
 						return;
 					}
-
-					i2p::data::netdb.AddRouterInfo (buf.data () + 4, size - 1); // TODO: should insert ri and not parse it twice
+					i2p::data::netdb.PostI2NPMsg (CreateI2NPMessage (eI2NPDummyMsg, buf.data () + 4, size - 1)); // TODO: should insert ri and not parse it twice
 					// TODO: process options
 						
 					// ready to communicate	
@@ -861,7 +860,7 @@ namespace transport
 				case eNTCP2BlkRouterInfo:
 				{
 					LogPrint (eLogDebug, "NTCP2: RouterInfo flag=", (int)frame[offset]);
-					i2p::data::netdb.AddRouterInfo (frame + offset + 1, size - 1);
+					i2p::data::netdb.PostI2NPMsg (CreateI2NPMessage (eI2NPDummyMsg, frame + offset + 1, size - 1));
 					break;
 				}
 				case eNTCP2BlkI2NPMessage:
diff --git a/libi2pd/NetDb.cpp b/libi2pd/NetDb.cpp
index 0add6f91..cbe23d59 100644
--- a/libi2pd/NetDb.cpp
+++ b/libi2pd/NetDb.cpp
@@ -98,6 +98,10 @@ namespace data
 							case eI2NPDatabaseLookup:
 								HandleDatabaseLookupMsg (msg);
 							break;
+							case eI2NPDummyMsg:
+								// plain RouterInfo from NTCP2 for now
+								AddRouterInfo (msg->GetPayload (), msg->GetPayloadLength ());
+							break;	
 							default: // WTF?
 								LogPrint (eLogError, "NetDb: unexpected message type ", (int) msg->GetTypeID ());
 								//i2p::HandleI2NPMessage (msg);