Stop sending empty Batches to the client!