diff --git a/libi2pd/NetDb.cpp b/libi2pd/NetDb.cpp
index f2166bf0..f3822997 100644
--- a/libi2pd/NetDb.cpp
+++ b/libi2pd/NetDb.cpp
@@ -149,7 +149,7 @@ namespace data
 				if (!i2p::transport::transports.IsOnline ()) continue; // don't manage netdb when offline
 
 				uint64_t ts = i2p::util::GetSecondsSinceEpoch ();
-				if (ts - lastManageRequest >= 15 || ts + 15 < lastManageRequest) // manage requests every 15 seconds
+				if (ts - lastManageRequest >= MANAGE_REQUESTS_INTERVAL || ts + MANAGE_REQUESTS_INTERVAL < lastManageRequest) // manage requests every 15 seconds
 				{
 					m_Requests.ManageRequests ();
 					lastManageRequest = ts;
diff --git a/libi2pd/NetDbRequests.h b/libi2pd/NetDbRequests.h
index 47a5d481..25c102de 100644
--- a/libi2pd/NetDbRequests.h
+++ b/libi2pd/NetDbRequests.h
@@ -21,8 +21,9 @@ namespace i2p
 namespace data
 {
 	const size_t MAX_NUM_REQUEST_ATTEMPTS = 7;
+	const uint64_t MANAGE_REQUESTS_INTERVAL = 15; // in seconds
 	const uint64_t MIN_REQUEST_TIME = 5; // in seconds
-	const uint64_t MAX_REQUEST_TIME = 60; // in seconds
+	const uint64_t MAX_REQUEST_TIME = MAX_NUM_REQUEST_ATTEMPTS*MANAGE_REQUESTS_INTERVAL;
 	
 	class RequestedDestination
 	{