diff --git a/daemon/Daemon.cpp b/daemon/Daemon.cpp
index 6c895c5e..5ea1bfc0 100644
--- a/daemon/Daemon.cpp
+++ b/daemon/Daemon.cpp
@@ -253,20 +253,13 @@ namespace util
 		bool ssu2; i2p::config::GetOption("ssu2.enabled", ssu2);
 		if (ssu2)
 		{
+			uint16_t ssu2port; i2p::config::GetOption("ssu2.port", ssu2port);
+			if (!ssu2port) ssu2port = port;
 			bool published; i2p::config::GetOption("ssu2.published", published);
 			if (published)
-			{
-				uint16_t ssu2port; i2p::config::GetOption("ssu2.port", ssu2port);
-				if (!ssu2port)
-				{
-					ssu2port = port;
-					bool ssu; i2p::config::GetOption("ssu", ssu);
-					if (ssu) ssu2port++;
-				}	
 				i2p::context.PublishSSU2Address (ssu2port, true, ipv4, ipv6); // publish
-			}
 			else
-				i2p::context.PublishSSU2Address (0, false, ipv4, ipv6); // unpublish
+				i2p::context.PublishSSU2Address (ssu2port, false, ipv4, ipv6); // unpublish
 		}
 
 		bool transit; i2p::config::GetOption("notransit", transit);