diff --git a/libi2pd/RouterContext.cpp b/libi2pd/RouterContext.cpp
index aab5de8f..53244b6c 100644
--- a/libi2pd/RouterContext.cpp
+++ b/libi2pd/RouterContext.cpp
@@ -78,8 +78,6 @@ namespace i2p
 			m_Service->Stop ();
 			CleanUp (); // GarlicDestination
 		}
-		if (m_SavingRouterInfo.valid ())
-			m_SavingRouterInfo.get ();
 	}	
 
 	std::shared_ptr<i2p::data::RouterInfo::Buffer> RouterContext::CopyRouterInfoBuffer () const
@@ -256,21 +254,12 @@ namespace i2p
 
 	void RouterContext::UpdateRouterInfo ()
 	{
-		std::shared_ptr<i2p::data::RouterInfo::Buffer> buffer;
 		{
 			std::lock_guard<std::mutex> l(m_RouterInfoMutex);
 			m_RouterInfo.CreateBuffer (m_Keys);
-			buffer = m_RouterInfo.CopyBuffer ();
 		}
+		m_RouterInfo.SaveToFile (i2p::fs::DataDirPath (ROUTER_INFO));
 		m_LastUpdateTime = i2p::util::GetSecondsSinceEpoch ();
-		// defer saving buffer to disk
-		if (m_SavingRouterInfo.valid ())
-			m_SavingRouterInfo.get ();
-		m_SavingRouterInfo = std::async (std::launch::async, 
-			[buffer = std::move(buffer)]() 
-		    {
-				i2p::data::RouterInfo::SaveToFile (i2p::fs::DataDirPath (ROUTER_INFO), buffer);
-			});
 	}
 
 	void RouterContext::NewNTCP2Keys ()
diff --git a/libi2pd/RouterContext.h b/libi2pd/RouterContext.h
index 29af6dac..ae62ebf3 100644
--- a/libi2pd/RouterContext.h
+++ b/libi2pd/RouterContext.h
@@ -13,7 +13,6 @@
 #include <string>
 #include <memory>
 #include <random>
-#include <future>
 #include <unordered_set>
 #include <boost/asio.hpp>
 #include "Identity.h"
@@ -267,7 +266,6 @@ namespace garlic
 			bool m_IsHiddenMode; // not publish
 			mutable std::mutex m_RouterInfoMutex;
 			std::mt19937 m_Rng;
-			std::future<void> m_SavingRouterInfo;
 	};
 
 	extern RouterContext context;