diff --git a/include/libtorrent/bandwidth_manager.hpp b/include/libtorrent/bandwidth_manager.hpp
index fd7904493..edf1ecf44 100644
--- a/include/libtorrent/bandwidth_manager.hpp
+++ b/include/libtorrent/bandwidth_manager.hpp
@@ -141,6 +141,7 @@ struct bandwidth_manager
 		m_abort = true;
 		m_queue.clear();
 		m_history.clear();
+		m_current_quota = 0;
 		m_history_timer.cancel();
 	}
 
diff --git a/src/session_impl.cpp b/src/session_impl.cpp
index afc74ab6a..3d3392b6a 100755
--- a/src/session_impl.cpp
+++ b/src/session_impl.cpp
@@ -630,8 +630,6 @@ namespace detail
 		if (m_dht) m_dht->stop();
 		m_dht_socket.close();
 #endif
-		m_download_channel.close();
-		m_upload_channel.close();
 		m_timer.cancel();
 
 		// close the listen sockets