diff --git a/libi2pd/RouterContext.cpp b/libi2pd/RouterContext.cpp
index 2cc2becd..aab5de8f 100644
--- a/libi2pd/RouterContext.cpp
+++ b/libi2pd/RouterContext.cpp
@@ -78,8 +78,8 @@ namespace i2p
 			m_Service->Stop ();
 			CleanUp (); // GarlicDestination
 		}
-		if (m_SavingRouterInfo.valid () && m_SavingRouterInfo.wait_for(std::chrono::seconds(0)) != std::future_status::ready)		
-			m_SavingRouterInfo.wait ();
+		if (m_SavingRouterInfo.valid ())
+			m_SavingRouterInfo.get ();
 	}	
 
 	std::shared_ptr<i2p::data::RouterInfo::Buffer> RouterContext::CopyRouterInfoBuffer () const
@@ -265,12 +265,7 @@ namespace i2p
 		m_LastUpdateTime = i2p::util::GetSecondsSinceEpoch ();
 		// defer saving buffer to disk
 		if (m_SavingRouterInfo.valid ())
-		{
-			if (m_SavingRouterInfo.wait_for(std::chrono::seconds(0)) != std::future_status::ready)		
-				// wait until previous update complete
-				m_SavingRouterInfo.wait ();
 			m_SavingRouterInfo.get ();
-		}	
 		m_SavingRouterInfo = std::async (std::launch::async, 
 			[buffer = std::move(buffer)]() 
 		    {