diff --git a/libi2pd/Destination.cpp b/libi2pd/Destination.cpp
index 9e5fbe20..1a93f163 100644
--- a/libi2pd/Destination.cpp
+++ b/libi2pd/Destination.cpp
@@ -1083,6 +1083,7 @@ namespace client
 			{
 				// streaming protocol
 				auto dest = GetStreamingDestination (toPort);
+				if (!dest) dest = m_StreamingDestination; // if no destination on port use default
 				if (dest)
 					dest->HandleDataMessagePayload (buf, length);
 				else
@@ -1236,8 +1237,9 @@ namespace client
 			if (it != m_StreamingDestinationsByPorts.end ())
 				return it->second;
 		}
-		// if port is zero or not found, use default destination
-		return m_StreamingDestination;
+		else // if port is zero, use default destination
+			return m_StreamingDestination;
+		return nullptr;
 	}
 
 	void ClientDestination::AcceptStreams (const i2p::stream::StreamingDestination::Acceptor& acceptor)
diff --git a/libi2pd_client/I2PTunnel.cpp b/libi2pd_client/I2PTunnel.cpp
index 07cb0224..78634b7e 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 || (inport && (m_PortDestination == localDestination->GetStreamingDestination ()))) // default destination	
+		if (!m_PortDestination) // default destination	
 			m_PortDestination = localDestination->CreateStreamingDestination (inport, gzip);
 	}