diff --git a/aseba/thymio-device-manager/aseba_node_registery.cpp b/aseba/thymio-device-manager/aseba_node_registery.cpp
index 0837fea2f..9a4d3ab82 100644
--- a/aseba/thymio-device-manager/aseba_node_registery.cpp
+++ b/aseba/thymio-device-manager/aseba_node_registery.cpp
@@ -108,7 +108,7 @@ aseba_node_registery::node_map aseba_node_registery::nodes() const {
 
 void aseba_node_registery::set_tcp_endpoint(const boost::asio::ip::tcp::endpoint& endpoint) {
     m_nodes_service_desc.endpoint(endpoint);
-    //update_discovery(); //make in only once after ws_endpoint
+    update_discovery();
 }
 
 void aseba_node_registery::set_ws_endpoint(const boost::asio::ip::tcp::endpoint& endpoint) {
@@ -134,6 +134,7 @@ void aseba_node_registery::update_discovery() {
 void aseba_node_registery::on_update_discovery_complete(const boost::system::error_code& ec) {
     if(ec) {
         mLogError("Discovery : {}", ec.message());
+		m_discovery_needs_update = true;
     } else {
         mLogTrace("Discovery : update complete");
 		m_updating_discovery = false;