diff --git a/NetDb.cpp b/NetDb.cpp
index fe1d6a45..6d019316 100644
--- a/NetDb.cpp
+++ b/NetDb.cpp
@@ -496,9 +496,11 @@ namespace data
 					std::set<IdentHash> excluded;
 					for (int i = 0; i < 3; i++)
 					{
-						auto floodfill = GetClosestFloodfill (ident, excluded);
+						auto floodfill = GetClosestFloodfill (ident, excluded, true); // we need a floodfill close than us only
 						if (floodfill)
 							transports.SendMessage (floodfill->GetIdentHash (), floodMsg);
+						else
+							break;
 					}	
 				}	
 				else
@@ -885,12 +887,15 @@ namespace data
 	}	
 
 	std::shared_ptr<const RouterInfo> NetDb::GetClosestFloodfill (const IdentHash& destination, 
-		const std::set<IdentHash>& excluded) const
+		const std::set<IdentHash>& excluded, bool closeThanUsOnly) const
 	{
 		std::shared_ptr<const RouterInfo> r;
 		XORMetric minMetric;
 		IdentHash destKey = CreateRoutingKey (destination);
-		minMetric.SetMax ();
+		if (closeThanUsOnly)
+			minMetric = destKey ^ i2p::context.GetIdentHash ();
+		else	
+			minMetric.SetMax ();
 		std::unique_lock<std::mutex> l(m_FloodfillsMutex);
 		for (auto it: m_Floodfills)
 		{	
diff --git a/NetDb.h b/NetDb.h
index 237e5be1..f1b97728 100644
--- a/NetDb.h
+++ b/NetDb.h
@@ -52,7 +52,7 @@ namespace data
 			std::shared_ptr<const RouterInfo> GetHighBandwidthRandomRouter (std::shared_ptr<const RouterInfo> compatibleWith) const;
 			std::shared_ptr<const RouterInfo> GetRandomPeerTestRouter () const;
 			std::shared_ptr<const RouterInfo> GetRandomIntroducer () const;
-			std::shared_ptr<const RouterInfo> GetClosestFloodfill (const IdentHash& destination, const std::set<IdentHash>& excluded) const;
+			std::shared_ptr<const RouterInfo> GetClosestFloodfill (const IdentHash& destination, const std::set<IdentHash>& excluded, bool closeThanUsOnly = false) const;
 			std::vector<IdentHash> GetClosestFloodfills (const IdentHash& destination, size_t num,
 				std::set<IdentHash>& excluded) const;
 			std::shared_ptr<const RouterInfo> GetClosestNonFloodfill (const IdentHash& destination, const std::set<IdentHash>& excluded) const;