Fix accumulation of messages in staging queue