Some sends happen before the drift

Just realized we don't have an issue in which we can discuss this, so opening.

Also see merge request !303 (merged).