diff --git a/daemon/Daemon.cpp b/daemon/Daemon.cpp
index 91db50fd..e33f3d6d 100644
--- a/daemon/Daemon.cpp
+++ b/daemon/Daemon.cpp
@@ -202,7 +202,11 @@ namespace util
 				i2p::context.PublishNTCP2Address (port, false); // unpublish
 		}
 		if (ygg)
+		{
+			if (!ntcp2)
+				i2p::context.PublishNTCP2Address (port, true); 
 			i2p::context.UpdateNTCP2V6Address (yggaddr);
+		}	
 		
 		bool transit; i2p::config::GetOption("notransit", transit);
 		i2p::context.SetAcceptsTunnels (!transit);
diff --git a/libi2pd/RouterContext.cpp b/libi2pd/RouterContext.cpp
index 1fe66762..b2e83178 100644
--- a/libi2pd/RouterContext.cpp
+++ b/libi2pd/RouterContext.cpp
@@ -679,7 +679,8 @@ namespace i2p
 
 		// read NTCP2
 		bool ntcp2;  i2p::config::GetOption("ntcp2.enabled", ntcp2);
-		if (ntcp2)
+		bool ygg;  i2p::config::GetOption("meshnets.yggdrasil", ygg);
+		if (ntcp2 || ygg)
 		{
 			if (!m_NTCP2Keys) NewNTCP2Keys ();
 			UpdateNTCP2Address (true); // enable NTCP2