diff --git a/libi2pd/Tunnel.cpp b/libi2pd/Tunnel.cpp
index bf1bad46..249f0a31 100644
--- a/libi2pd/Tunnel.cpp
+++ b/libi2pd/Tunnel.cpp
@@ -593,7 +593,8 @@ namespace tunnel
 		{	
 			// transit DatabaseStore might contain new/updated RI
 			auto m = CopyI2NPMessage (msg);
-			memset (m->GetPayload () + DATABASE_STORE_REPLY_TOKEN_OFFSET, 0xFF, 4); // fake replyToken meaning no reply
+			if (bufbe32toh (m->GetPayload () + DATABASE_STORE_REPLY_TOKEN_OFFSET))
+				memset (m->GetPayload () + DATABASE_STORE_REPLY_TOKEN_OFFSET, 0xFF, 4); // fake replyToken meaning no reply
 			i2p::data::netdb.PostI2NPMsg (m);
 		}	
 		tunnel->SendTunnelDataMsg (msg);
diff --git a/libi2pd/TunnelEndpoint.cpp b/libi2pd/TunnelEndpoint.cpp
index fe90da60..b2a0c837 100644
--- a/libi2pd/TunnelEndpoint.cpp
+++ b/libi2pd/TunnelEndpoint.cpp
@@ -331,7 +331,8 @@ namespace tunnel
 			else if (IsRouterInfoMsg (msg.data))
 			{	
 				auto m = CopyI2NPMessage (msg.data);
-				memset (m->GetPayload () + DATABASE_STORE_REPLY_TOKEN_OFFSET, 0xFF, 4); // fake replyToken meaning no reply
+				if (bufbe32toh (m->GetPayload () + DATABASE_STORE_REPLY_TOKEN_OFFSET))
+					memset (m->GetPayload () + DATABASE_STORE_REPLY_TOKEN_OFFSET, 0xFF, 4); // fake replyToken meaning no reply
 				i2p::data::netdb.PostI2NPMsg (m);
 			}	
 		}