diff --git a/ros_gz_bridge/src/parameter_bridge.cpp b/ros_gz_bridge/src/parameter_bridge.cpp
index 49f27e6e..12aac8ab 100644
--- a/ros_gz_bridge/src/parameter_bridge.cpp
+++ b/ros_gz_bridge/src/parameter_bridge.cpp
@@ -172,8 +172,5 @@ int main(int argc, char * argv[])
   // ROS 2 spinner
   rclcpp::spin(bridge_node);
 
-  // Wait for gz node shutdown
-  ignition::transport::waitForShutdown();
-
   return 0;
 }
diff --git a/ros_gz_bridge/src/static_bridge.cpp b/ros_gz_bridge/src/static_bridge.cpp
index bc2ab5d4..bf5cd38d 100644
--- a/ros_gz_bridge/src/static_bridge.cpp
+++ b/ros_gz_bridge/src/static_bridge.cpp
@@ -44,8 +44,5 @@ int main(int argc, char * argv[])
 
   rclcpp::spin(bridge_node);
 
-  // Wait for gz node shutdown
-  ignition::transport::waitForShutdown();
-
   return 0;
 }
diff --git a/ros_gz_image/src/image_bridge.cpp b/ros_gz_image/src/image_bridge.cpp
index 6839e295..c7edf9dc 100644
--- a/ros_gz_image/src/image_bridge.cpp
+++ b/ros_gz_image/src/image_bridge.cpp
@@ -97,7 +97,5 @@ int main(int argc, char * argv[])
   // Spin ROS and Gz until shutdown
   rclcpp::spin(node_);
 
-  ignition::transport::waitForShutdown();
-
   return 0;
 }