diff --git a/libi2pd/RouterContext.cpp b/libi2pd/RouterContext.cpp
index e5a40242..aa588a05 100644
--- a/libi2pd/RouterContext.cpp
+++ b/libi2pd/RouterContext.cpp
@@ -425,7 +425,7 @@ namespace i2p
 		if (v4)
 		{
 			auto addr = (*addresses)[i2p::data::RouterInfo::eNTCP2V4Idx];
-			if (addr && (addr->port != port || addr->published != publish))
+			if (addr && (addr->port != port || addr->published != publish || addr->v != version))
 			{
 				PublishNTCP2Address (addr, port, publish, version);
 				updated = true;
@@ -434,7 +434,7 @@ namespace i2p
 		if (v6)
 		{
 			auto addr = (*addresses)[i2p::data::RouterInfo::eNTCP2V6Idx];
-			if (addr && (addr->port != port || addr->published != publish))
+			if (addr && (addr->port != port || addr->published != publish || addr->v != version))
 			{
 				PublishNTCP2Address (addr, port, publish, version);
 				updated = true;
diff --git a/libi2pd_client/ClientContext.cpp b/libi2pd_client/ClientContext.cpp
index b1eebe70..0199522d 100644
--- a/libi2pd_client/ClientContext.cpp
+++ b/libi2pd_client/ClientContext.cpp
@@ -547,8 +547,11 @@ namespace client
 		if (tunConf.empty ())
 			tunConf = i2p::fs::DataDirPath ("tunnels.conf");
 
-		LogPrint(eLogDebug, "Clients: Tunnels config file: ", tunConf);
-		ReadTunnels (tunConf, numClientTunnels, numServerTunnels);
+		if (i2p::fs::Exists (tunConf))
+		{
+            LogPrint(eLogDebug, "Clients: Tunnels config file: ", tunConf);
+            ReadTunnels (tunConf, numClientTunnels, numServerTunnels);
+        }
 
 		std::string tunDir; i2p::config::GetOption("tunnelsdir", tunDir);
 		if (tunDir.empty ())