diff --git a/contrib/webconsole/style.css b/contrib/webconsole/style.css
index b6e56477..047839a6 100644
--- a/contrib/webconsole/style.css
+++ b/contrib/webconsole/style.css
@@ -21,7 +21,6 @@ a.button {
 	-moz-appearance: button;
 	appearance: button;
 	text-decoration: none;
-	color: initial;
 	padding: 0 5px;
 	border: 1px solid #894C84;
 }
@@ -198,7 +197,6 @@ textarea {
 		-moz-appearance: button;
 		appearance: button;
 		text-decoration: none;
-		color: initial;
 		margin-top: 10px;
 		padding: 6px;
 		border: 1px solid #894c84;
diff --git a/libi2pd/Streaming.cpp b/libi2pd/Streaming.cpp
index bbb649df..95f6a150 100644
--- a/libi2pd/Streaming.cpp
+++ b/libi2pd/Streaming.cpp
@@ -104,6 +104,7 @@ namespace stream
 
 	void Stream::Terminate (bool deleteFromDestination) // shoudl be called from StreamingDestination::Stop only
 	{
+		m_Status = eStreamStatusTerminated;
 		m_AckSendTimer.cancel ();
 		m_ReceiveTimer.cancel ();
 		m_ResendTimer.cancel ();
@@ -857,12 +858,15 @@ namespace stream
 
 	void Stream::ScheduleResend ()
 	{
-		m_ResendTimer.cancel ();
-		// check for invalid value
-		if (m_RTO <= 0) m_RTO = INITIAL_RTO;
-		m_ResendTimer.expires_from_now (boost::posix_time::milliseconds(m_RTO));
-		m_ResendTimer.async_wait (std::bind (&Stream::HandleResendTimer,
-			shared_from_this (), std::placeholders::_1));
+		if (m_Status != eStreamStatusTerminated)
+		{	
+			m_ResendTimer.cancel ();
+			// check for invalid value
+			if (m_RTO <= 0) m_RTO = INITIAL_RTO;
+			m_ResendTimer.expires_from_now (boost::posix_time::milliseconds(m_RTO));
+			m_ResendTimer.async_wait (std::bind (&Stream::HandleResendTimer,
+				shared_from_this (), std::placeholders::_1));
+		}	
 	}
 
 	void Stream::HandleResendTimer (const boost::system::error_code& ecode)
diff --git a/libi2pd/Streaming.h b/libi2pd/Streaming.h
index c40c49f5..9d206098 100644
--- a/libi2pd/Streaming.h
+++ b/libi2pd/Streaming.h
@@ -152,7 +152,8 @@ namespace stream
 		eStreamStatusOpen,
 		eStreamStatusReset,
 		eStreamStatusClosing,
-		eStreamStatusClosed
+		eStreamStatusClosed,
+		eStreamStatusTerminated
 	};
 
 	class StreamingDestination;
diff --git a/libi2pd_client/SAM.cpp b/libi2pd_client/SAM.cpp
index af9ba6a8..c2983f43 100644
--- a/libi2pd_client/SAM.cpp
+++ b/libi2pd_client/SAM.cpp
@@ -1207,7 +1207,11 @@ namespace client
 	void SAMSingleSession::StopLocalDestination ()
 	{
 		localDestination->Release ();
+		// stop accepting new streams
 		localDestination->StopAcceptingStreams ();
+		// terminate existing streams
+		auto s = localDestination->GetStreamingDestination (); // TODO: take care about datagrams
+		if (s) s->Stop ();
 	}
 
 	void SAMMasterSession::Close ()