diff --git a/tools/rosgraph/src/rosgraph/xmlrpc.py b/tools/rosgraph/src/rosgraph/xmlrpc.py
index 4d1de93d9a..fcb6ca4af0 100644
--- a/tools/rosgraph/src/rosgraph/xmlrpc.py
+++ b/tools/rosgraph/src/rosgraph/xmlrpc.py
@@ -229,8 +229,8 @@ def shutdown(self, reason):
             if handler:
                 handler._shutdown(reason)
             if server:
-                server.socket.close()
                 server.server_close()
+                server.shutdown()
                 
     def start(self):
         """