diff --git a/src/runtime2/consensus.rs b/src/runtime2/consensus.rs
index 8e5e985f91578aa95625780c1bd0b1d30e83042a..b9980cbe237784ea95c05c76c986e651322ba3b3 100644
--- a/src/runtime2/consensus.rs
+++ b/src/runtime2/consensus.rs
@@ -350,7 +350,10 @@ impl Consensus {
         // TODO: Handle multiple firings. Right now we just assign the current
         //  branch to the `None` value because we know we can only send once.
         let data_header = DataHeader{
-            expected_mapping: branch.channel_mapping.clone(),
+            expected_mapping: branch.channel_mapping.iter()
+                .filter(|v| v.registered_id.is_some() || v.channel_id == port_info.channel_id)
+                .copied()
+                .collect(),
             sending_port: port_info.self_id,
             target_port: port_info.peer_id,
             new_mapping: branch.cur_marker,