diff --git a/libi2pd_client/I2PTunnel.cpp b/libi2pd_client/I2PTunnel.cpp
index db0d0c04096..07cb0224652 100644
--- a/libi2pd_client/I2PTunnel.cpp
+++ b/libi2pd_client/I2PTunnel.cpp
@@ -693,7 +693,7 @@ namespace client
 	{
 		if (!inport) inport = port;	
 		m_PortDestination = localDestination->GetStreamingDestination (inport);	
-		if (!m_PortDestination)	
+		if (!m_PortDestination || (inport && (m_PortDestination == localDestination->GetStreamingDestination ()))) // default destination	
 			m_PortDestination = localDestination->CreateStreamingDestination (inport, gzip);
 	}