diff --git a/libi2pd/Streaming.cpp b/libi2pd/Streaming.cpp
index 4f943912..d666d786 100644
--- a/libi2pd/Streaming.cpp
+++ b/libi2pd/Streaming.cpp
@@ -86,13 +86,13 @@ namespace stream
 		LogPrint (eLogDebug, "Streaming: Stream deleted");
 	}
 
-	void Stream::Terminate ()
+	void Stream::Terminate () // shoudl be called from StreamingDestination::Stop only
 	{
 		m_AckSendTimer.cancel ();
 		m_ReceiveTimer.cancel ();
 		m_ResendTimer.cancel ();
 		//CleanUp (); /* Need to recheck - broke working on windows */
-		m_LocalDestination.DeleteStream (shared_from_this ());
+		//m_LocalDestination.DeleteStream (shared_from_this ());
 	}
 
 	void Stream::CleanUp ()
@@ -989,6 +989,8 @@ namespace stream
 		m_PendingIncomingStreams.clear ();
 		{
 			std::unique_lock<std::mutex> l(m_StreamsMutex);
+			for (auto it: m_Streams)
+				it.second->Terminate ();		
 			m_Streams.clear ();
 			m_IncomingStreams.clear ();
 		}
diff --git a/libi2pd/Streaming.h b/libi2pd/Streaming.h
index 49962507..3424bb2d 100644
--- a/libi2pd/Streaming.h
+++ b/libi2pd/Streaming.h
@@ -180,7 +180,6 @@ namespace stream
 			int GetWindowSize () const { return m_WindowSize; };
 			int GetRTT () const { return m_RTT; };
 
-			/** don't call me */
 			void Terminate ();
 
 		private: