diff --git a/contrib/epee/include/net/abstract_tcp_server2.h b/contrib/epee/include/net/abstract_tcp_server2.h
index 77396ade4..f3dd7291c 100644
--- a/contrib/epee/include/net/abstract_tcp_server2.h
+++ b/contrib/epee/include/net/abstract_tcp_server2.h
@@ -279,6 +279,8 @@ namespace net_utils
 
     bool is_thread_worker();
 
+    bool cleanup_connections();
+
     /// The io_service used to perform asynchronous operations.
     std::unique_ptr<boost::asio::io_service> m_io_service_local_instance;
     boost::asio::io_service& io_service_;    
@@ -306,7 +308,7 @@ namespace net_utils
     connection_ptr new_connection_;
 
     std::mutex connections_mutex;
-    std::deque<connection_ptr> connections_;
+    std::deque<std::pair<boost::system_time, connection_ptr>> connections_;
 
   }; // class <>boosted_tcp_server
 
diff --git a/contrib/epee/include/net/abstract_tcp_server2.inl b/contrib/epee/include/net/abstract_tcp_server2.inl
index cb8bdc6ee..51c6f3501 100644
--- a/contrib/epee/include/net/abstract_tcp_server2.inl
+++ b/contrib/epee/include/net/abstract_tcp_server2.inl
@@ -55,6 +55,8 @@
 #include "../../../../src/p2p/data_logger.hpp"
 using namespace nOT::nUtils; // TODO
 
+#define CONNECTION_CLEANUP_TIME 30 // seconds
+
 PRAGMA_WARNING_PUSH
 namespace epee
 {
@@ -786,6 +788,7 @@ POP_WARNINGS
     m_threads_count = threads_count;
     m_main_thread_id = boost::this_thread::get_id();
     log_space::log_singletone::set_thread_log_prefix("[SRV_MAIN]");
+    add_idle_handler(boost::bind(&boosted_tcp_server::cleanup_connections, this), 5000);
     while(!m_stop_signal_sent)
     {
 
@@ -879,14 +882,28 @@ POP_WARNINGS
     connections_mutex.lock();
     for (auto &c: connections_)
     {
-      c->cancel();
+      c.second->cancel();
     }
+    connections_.clear();
     connections_mutex.unlock();
     io_service_.stop();
     CATCH_ENTRY_L0("boosted_tcp_server<t_protocol_handler>::send_stop_signal()", void());
   }
   //---------------------------------------------------------------------------------
   template<class t_protocol_handler>
+  bool boosted_tcp_server<t_protocol_handler>::cleanup_connections()
+  {
+    connections_mutex.lock();
+    boost::system_time cutoff = boost::get_system_time() - boost::posix_time::seconds(CONNECTION_CLEANUP_TIME);
+    while (!connections_.empty() && connections_.front().first < cutoff)
+    {
+      connections_.pop_front();
+    }
+    connections_mutex.unlock();
+    return true;
+  }
+  //---------------------------------------------------------------------------------
+  template<class t_protocol_handler>
   bool boosted_tcp_server<t_protocol_handler>::is_stop_signal_sent()
   {
     return m_stop_signal_sent;
@@ -926,7 +943,7 @@ POP_WARNINGS
 
     connection_ptr new_connection_l(new connection<t_protocol_handler>(io_service_, m_config, m_sock_count, m_sock_number, m_pfilter, m_connection_type) );
     connections_mutex.lock();
-    connections_.push_back(new_connection_l);
+    connections_.push_back(std::make_pair(boost::get_system_time(), new_connection_l));
     LOG_PRINT_L2("connections_ size now " << connections_.size());
     connections_mutex.unlock();
     boost::asio::ip::tcp::socket&  sock_ = new_connection_l->socket();
@@ -1022,7 +1039,7 @@ POP_WARNINGS
     TRY_ENTRY();    
     connection_ptr new_connection_l(new connection<t_protocol_handler>(io_service_, m_config, m_sock_count, m_sock_number, m_pfilter, m_connection_type) );
     connections_mutex.lock();
-    connections_.push_back(new_connection_l);
+    connections_.push_back(std::make_pair(boost::get_system_time(), new_connection_l));
     LOG_PRINT_L2("connections_ size now " << connections_.size());
     connections_mutex.unlock();
     boost::asio::ip::tcp::socket&  sock_ = new_connection_l->socket();