diff --git a/socketserver/server/commands.go b/socketserver/server/commands.go
index 3c5e55f3..ff8a1582 100644
--- a/socketserver/server/commands.go
+++ b/socketserver/server/commands.go
@@ -462,12 +462,12 @@ func C2SHandleBunchedCommand(conn *websocket.Conn, client *ClientInfo, msg Clien
 	go func() {
 		result := <-resultCh
 		var reply ClientMessage
+		reply.MessageID = msg.MessageID
 		if result.Err != nil {
 			reply.Command = ErrorCommand
 			reply.Arguments = result.Err.Error()
 		} else {
 			reply.Command = SuccessCommand
-			reply.MessageID = msg.MessageID
 			reply.origArguments = result.Val.(string)
 			reply.parseOrigArguments()
 		}