diff --git a/neo/master/service.py b/neo/master/service.py
index e01c9e6ac9319ae066a0dd30989b6a83f09a0e2d..d1c9d5aa8ebde2cc52e43523f55fe53158fa5440 100644
--- a/neo/master/service.py
+++ b/neo/master/service.py
@@ -573,9 +573,13 @@ class ServiceEventHandler(MasterEventHandler):
                 conn.answer(p, packet)
                 return
             else:
-                p = protocol.answerNodeState(app.uuid, state)
-                conn.answer(p, packet)
+                # I was asked to shutdown
+                node.setState(state)
+                ip, port = node.getServer()
+                node_list = [(node.getNodeType(), ip, port, node.getUUID(), node.getState()),]
+                conn.answer(protocol.notifyNodeInformation(node_list), packet)
                 app.shutdown()
+
         node = app.nm.getNodeByUUID(uuid)
         if node is None:
             p = protocol.protocolError('invalid uuid')