diff --git a/src/lsd.cpp b/src/lsd.cpp
index 44d7b19d4..6de085d99 100644
--- a/src/lsd.cpp
+++ b/src/lsd.cpp
@@ -183,6 +183,8 @@ void lsd::on_announce(udp::endpoint const& from, char* buffer
 
 void lsd::close()
 {
-	m_socket.close();
+	asio::error_code ec;
+	m_socket.close(ec);
+	m_broadcast_timer.cancel();
 }