diff --git a/crates/core/src/client/messages.rs b/crates/core/src/client/messages.rs index 67f3b90397b..00210077db9 100644 --- a/crates/core/src/client/messages.rs +++ b/crates/core/src/client/messages.rs @@ -280,7 +280,8 @@ impl ToProtocol for TransactionUpdateMessage { let TransactionUpdateMessage { event, database_update } = self; let update = database_update.database_update; protocol.assert_matches_format_switch(&update); - let request_id = database_update.request_id.unwrap_or(0); + let mut request_id = database_update.request_id.unwrap_or(0); + request_id = event.clone().map_or(request_id, |e| e.request_id.unwrap_or(request_id)); match update { FormatSwitch::Bsatn(update) => FormatSwitch::Bsatn(convert(event, request_id, update, |args| { Vec::from(args.get_bsatn().clone()).into()