fix double emit of first message if it happen to be on the list