diff --git a/libi2pd/RouterInfo.cpp b/libi2pd/RouterInfo.cpp
index 13988f5f..d0784ece 100644
--- a/libi2pd/RouterInfo.cpp
+++ b/libi2pd/RouterInfo.cpp
@@ -990,7 +990,7 @@ namespace data
 		return GetAddress (
 			[](std::shared_ptr<const RouterInfo::Address> address)->bool
 			{
-				return i2p::util::net::IsYggdrasilAddress (address->host);
+				return address->IsPublishedNTCP2 () && i2p::util::net::IsYggdrasilAddress (address->host);
 			});
 	}