diff --git a/src/runtime2/component/control_layer.rs b/src/runtime2/component/control_layer.rs
index 94cd052e5014343afd81807c3f2efe4bc4af2717..b7ad2c40b907deac5b614da1e0cba99181993434 100644
--- a/src/runtime2/component/control_layer.rs
+++ b/src/runtime2/component/control_layer.rs
@@ -124,10 +124,8 @@ impl ControlLayer {
                 // If a closed port is Ack'd, then we remove the reference to
                 // that component.
                 let port_handle = comp_ctx.get_port_handle(closed_port);
-                let port_info = comp_ctx.get_port(port_handle);
-                let port_peer_comp_id = port_info.peer_comp_id;
-                debug_assert!(port_info.state.is_closed());
-                comp_ctx.remove_peer(sched_ctx, port_handle, port_peer_comp_id, true); // remove if closed
+                debug_assert!(comp_ctx.get_port(port_handle).state.is_closed());
+                comp_ctx.change_port_peer(sched_ctx, port_handle, None);
 
                 return (AckAction::None, None);
             }