Use on-finished to drain request