diff --git a/libi2pd/Profiling.cpp b/libi2pd/Profiling.cpp
index b3617db5..45e4ae22 100644
--- a/libi2pd/Profiling.cpp
+++ b/libi2pd/Profiling.cpp
@@ -150,17 +150,19 @@ namespace data
 		}
 		else
 		{
-			m_NumTunnelsAgreed++;
+		    m_NumTunnelsAgreed++;
 			m_LastDeclineTime = 0;
 		}
 	}
 
 	void RouterProfile::TunnelNonReplied ()
 	{
-		m_NumTunnelsNonReplied++;
+	    m_NumTunnelsNonReplied++;
 		UpdateTime ();
 		if (m_NumTunnelsNonReplied > 2*m_NumTunnelsAgreed && m_NumTunnelsNonReplied > 3)
+		{
 			m_LastDeclineTime = i2p::util::GetSecondsSinceEpoch ();
+		}
 	}
 
 	void RouterProfile::Unreachable ()
@@ -221,6 +223,15 @@ namespace data
 			m_LastUnreachableTime = 0;
 		return (bool)m_LastUnreachableTime;
 	}
+	
+	bool RouterProfile::IsUseful() const {
+	    return
+	        m_NumTunnelsAgreed >= PEER_PROFILE_USEFUL_THRESHOLD ||
+	        m_NumTunnelsDeclined >= PEER_PROFILE_USEFUL_THRESHOLD ||
+	        m_NumTunnelsNonReplied >= PEER_PROFILE_USEFUL_THRESHOLD ||
+	        m_HasConnected;
+	}
+
 
 	std::shared_ptr<RouterProfile> GetRouterProfile (const IdentHash& identHash)
 	{
@@ -275,7 +286,7 @@ namespace data
 		}
 		auto ts = GetTime ();
 		for (auto& it: tmp)
-			if (it.second->IsUpdated () && (ts - it.second->GetLastUpdateTime ()).total_seconds () < PEER_PROFILE_EXPIRATION_TIMEOUT*3600)
+			if (it.second->IsUseful() && it.second->IsUpdated () && (ts - it.second->GetLastUpdateTime ()).total_seconds () < PEER_PROFILE_EXPIRATION_TIMEOUT*3600)
 				it.second->Save (it.first);
 	}	
 		
diff --git a/libi2pd/Profiling.h b/libi2pd/Profiling.h
index 08721bec..2520a6af 100644
--- a/libi2pd/Profiling.h
+++ b/libi2pd/Profiling.h
@@ -36,6 +36,7 @@ namespace data
 	const int PEER_PROFILE_DECLINED_RECENTLY_INTERVAL = 150; // in seconds (2.5 minutes)
 	const int PEER_PROFILE_PERSIST_INTERVAL = 3300; // in seconds (55 minutes)
 	const int PEER_PROFILE_UNREACHABLE_INTERVAL = 2*3600; // on seconds (2 hours)
+	const int PEER_PROFILE_USEFUL_THRESHOLD = 3;
 
 	class RouterProfile
 	{
@@ -60,6 +61,8 @@ namespace data
 			boost::posix_time::ptime GetLastUpdateTime () const { return m_LastUpdateTime; };
 			bool IsUpdated () const { return m_IsUpdated; };
 			
+			bool IsUseful() const;
+			
 		private:
 
 			void UpdateTime ();