diff --git a/src/runtime2/component/component_context.rs b/src/runtime2/component/component_context.rs
index 1d00c2c83fa9b0ae269fe690f659ef94cf4c9e1d..49699c17ab73e742f3c3872b2ef131cb7db7885c 100644
--- a/src/runtime2/component/component_context.rs
+++ b/src/runtime2/component/component_context.rs
@@ -129,8 +129,8 @@ pub struct Port {
     pub kind: PortKind,
     pub state: PortState,
     // State tracking for error detection and error handling
+    pub last_registered_round: Option<u32>,
     pub last_instruction: PortInstruction, // used during sync round to detect port-closed-during-sync errors
-    pub received_message_for_sync: bool, // used during sync round to detect port-closed-before-sync errors
     pub close_at_sync_end: bool, // set during sync round when receiving a port-closed-after-sync message
     pub(crate) associated_with_peer: bool,
 }
@@ -181,9 +181,9 @@ impl CompCtx {
             kind: PortKind::Putter,
             state: PortState::new(),
             peer_comp_id: self.id,
+            last_registered_round: None,
             last_instruction: PortInstruction::None,
             close_at_sync_end: false,
-            received_message_for_sync: false,
             associated_with_peer: false,
         });
         self.ports.push(Port{
@@ -192,9 +192,9 @@ impl CompCtx {
             kind: PortKind::Getter,
             state: PortState::new(),
             peer_comp_id: self.id,
+            last_registered_round: None,
             last_instruction: PortInstruction::None,
             close_at_sync_end: false,
-            received_message_for_sync: false,
             associated_with_peer: false,
         });
 
@@ -206,9 +206,9 @@ impl CompCtx {
         let self_id = PortId(self.take_port_id());
         self.ports.push(Port{
             self_id, peer_comp_id, peer_port_id, kind, state,
+            last_registered_round: None,
             last_instruction: PortInstruction::None,
             close_at_sync_end: false,
-            received_message_for_sync: false,
             associated_with_peer: false,
         });
         return LocalPortHandle(self_id);