Fixed bug with duplicate send when using ES mode