diff --git a/libi2pd/NTCP2.cpp b/libi2pd/NTCP2.cpp
index 8b44a795..60eab17c 100644
--- a/libi2pd/NTCP2.cpp
+++ b/libi2pd/NTCP2.cpp
@@ -1305,7 +1305,8 @@ namespace transport
 						if (ecode != boost::asio::error::operation_aborted)
 						{
 							LogPrint (eLogInfo, "NTCP2: Not connected in ", timeout, " seconds");
-							//i2p::data::netdb.SetUnreachable (conn->GetRemoteIdentity ()->GetIdentHash (), true);
+							if (conn->GetRemoteIdentity ())
+								i2p::data::netdb.SetUnreachable (conn->GetRemoteIdentity ()->GetIdentHash (), true);
 							conn->Terminate ();
 						}
 					});
diff --git a/libi2pd/Transports.cpp b/libi2pd/Transports.cpp
index 7157306d..6f163e5f 100644
--- a/libi2pd/Transports.cpp
+++ b/libi2pd/Transports.cpp
@@ -440,7 +440,7 @@ namespace transport
 				{
 					// NTCP2 have priority over NTCP
 					auto address = peer.router->GetNTCP2Address (true, !context.SupportsV6 ()); // published only
-					if (address)
+					if (address  && !peer.router->IsUnreachable ())
 					{
 						auto s = std::make_shared<NTCP2Session> (*m_NTCP2Server, peer.router);