diff --git a/aseba/thymio-device-manager/aseba_node_registery.cpp b/aseba/thymio-device-manager/aseba_node_registery.cpp
index 9a4d3ab82..ce158bf81 100644
--- a/aseba/thymio-device-manager/aseba_node_registery.cpp
+++ b/aseba/thymio-device-manager/aseba_node_registery.cpp
@@ -108,11 +108,13 @@ 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();
 }
 
 void aseba_node_registery::set_ws_endpoint(const boost::asio::ip::tcp::endpoint& endpoint) {
     m_ws_endpoint = endpoint;
+}
+
+void aseba_node_registery::set_discovery() {
     update_discovery();
 }
 
diff --git a/aseba/thymio-device-manager/aseba_node_registery.h b/aseba/thymio-device-manager/aseba_node_registery.h
index 0a3a00bdd..64d72a22b 100644
--- a/aseba/thymio-device-manager/aseba_node_registery.h
+++ b/aseba/thymio-device-manager/aseba_node_registery.h
@@ -30,6 +30,7 @@ class aseba_node_registery : public boost::asio::detail::service_base<aseba_node
 
     void set_tcp_endpoint(const boost::asio::ip::tcp::endpoint& endpoint);
     void set_ws_endpoint(const boost::asio::ip::tcp::endpoint& endpoint);
+	void set_discovery();
 
     node_map nodes() const;
     std::shared_ptr<aseba_node> node_from_id(const node_id&) const;
diff --git a/aseba/thymio-device-manager/main.cpp b/aseba/thymio-device-manager/main.cpp
index 3222c589c..fdc777516 100644
--- a/aseba/thymio-device-manager/main.cpp
+++ b/aseba/thymio-device-manager/main.cpp
@@ -64,6 +64,9 @@ void run_service(boost::asio::io_context& ctx) {
     mobsya::application_server<mobsya::websocket_t> websocket_server(ctx, 8597);
 	node_registery.set_ws_endpoint(websocket_server.endpoint());
     websocket_server.accept();
+	
+	// Enable Bonjour, Zeroconf 
+	node_registery.set_discovery();
     
 
 #ifdef MOBSYA_TDM_ENABLE_USB