diff --git a/tools/roslaunch/src/roslaunch/parent.py b/tools/roslaunch/src/roslaunch/parent.py
index 58e9294900..ed2b9d8466 100644
--- a/tools/roslaunch/src/roslaunch/parent.py
+++ b/tools/roslaunch/src/roslaunch/parent.py
@@ -279,7 +279,12 @@ def _stop_infrastructure(self):
         
         if self.server:
             try:
-                self.server.shutdown("roslaunch parent complete")
+                import sys
+                if sys.version_info >= (3, 0):
+                    # https://github.com/ros/ros_comm/issues/2238
+                    self.server.shutdown()
+                else:
+                    self.server.shutdown("roslaunch parent complete")
             except:
                 # don't let exceptions halt the rest of the shutdown
                 pass