Improve heartbeat production when a payload is provided (sync and deferred)