diff --git a/micro_ros_agent/include/agent/graph_manager/graph_manager.hpp b/micro_ros_agent/include/agent/graph_manager/graph_manager.hpp
index 4b1780b..255ea58 100644
--- a/micro_ros_agent/include/agent/graph_manager/graph_manager.hpp
+++ b/micro_ros_agent/include/agent/graph_manager/graph_manager.hpp
@@ -80,17 +80,15 @@ public:
     /**
      * @brief   Default destructor.
      */
-    ~GraphManager() = default;
-
-	void stop()
-	{
-		if (microros_graph_publisher_.joinable())
-		{
-			exit = true;
-        	cv_.notify_one();
-			microros_graph_publisher_.join();
-		}
-	}
+    ~GraphManager()
+    {
+        if (microros_graph_publisher_.joinable())
+        {
+            exit = true;
+            cv_.notify_one();
+            microros_graph_publisher_.join();
+        }
+    }
 
     /**
      * @brief   Implementation of the notification logic that updates the micro-ROS graph.
diff --git a/micro_ros_agent/src/agent/Agent.cpp b/micro_ros_agent/src/agent/Agent.cpp
index 6cc87ce..cfef9c2 100644
--- a/micro_ros_agent/src/agent/Agent.cpp
+++ b/micro_ros_agent/src/agent/Agent.cpp
@@ -188,13 +188,6 @@ void Agent::run()
 void Agent::stop()
 {
     xrce_dds_agent_instance_.stop();
-
-    for (auto & element : graph_manager_map_)
-    {
-        element.second.stop();
-    }
-
-    graph_manager_map_.clear();
 }
 
 graph_manager::GraphManager* Agent::find_or_create_graph_manager(eprosima::fastdds::dds::DomainId_t domain_id)