diff --git a/NetDb.cpp b/NetDb.cpp
index fbddb57f..061fe1e2 100644
--- a/NetDb.cpp
+++ b/NetDb.cpp
@@ -828,6 +828,8 @@ namespace data
 			if (floodfill && !floodfills.count (floodfill.get ())) // request floodfill only once
 			{	
 				floodfills.insert (floodfill.get ());
+				if (i2p::transport::transports.IsConnected (floodfill->GetIdentHash ()))
+					throughTunnels = false;
 				if (throughTunnels)
 				{	
 					msgs.push_back (i2p::tunnel::TunnelMessageBlock 
diff --git a/Transports.cpp b/Transports.cpp
index 00fd6bf0..c8d413e7 100644
--- a/Transports.cpp
+++ b/Transports.cpp
@@ -474,6 +474,12 @@ namespace transport
 		});	
 	}	
 
+	bool Transports::IsConnected (const i2p::data::IdentHash& ident) const
+	{
+		auto it = m_Peers.find (ident);
+		return it != m_Peers.end ();
+	}	
+		
 	void Transports::HandlePeerCleanupTimer (const boost::system::error_code& ecode)
 	{
 		if (ecode != boost::asio::error::operation_aborted)
diff --git a/Transports.h b/Transports.h
index 173ff87d..bcec3daa 100644
--- a/Transports.h
+++ b/Transports.h
@@ -88,7 +88,8 @@ namespace transport
 
 			void PeerConnected (std::shared_ptr<TransportSession> session);
 			void PeerDisconnected (std::shared_ptr<TransportSession> session);
-
+			bool IsConnected (const i2p::data::IdentHash& ident) const;
+			
 			void UpdateSentBytes (uint64_t numBytes) { m_TotalSentBytes += numBytes; };
 			void UpdateReceivedBytes (uint64_t numBytes) { m_TotalReceivedBytes += numBytes; };
 			uint64_t GetTotalSentBytes () const { return m_TotalSentBytes; };