diff --git a/src/runtime2/component/component_pdl.rs b/src/runtime2/component/component_pdl.rs
index c0effb7fd129d39a2d8cb625cf7c1c26ad0a5d05..f42259ea5a5a711d30d44cd09e1f4ab459aba2c8 100644
--- a/src/runtime2/component/component_pdl.rs
+++ b/src/runtime2/component/component_pdl.rs
@@ -679,7 +679,8 @@ impl CompPDL {
                     }
                 }
             } else {
-                // Peer is a different component
+                // Peer is a different component. We'll deal with sending the
+                // appropriate messages later
                 let peer_handle = creator_ctx.get_peer_handle(created_port_info.peer_comp_id);
                 let peer_info = creator_ctx.get_peer(peer_handle);
                 created_ctx.add_peer(pair.created_handle, sched_ctx, peer_info.id, Some(&peer_info.handle));
@@ -739,6 +740,7 @@ impl CompPDL {
                 let peer_port_handle = creator_ctx.get_port_handle(created_port_info.peer_port_id);
                 let peer_port_info = creator_ctx.get_port_mut(peer_port_handle);
                 peer_port_info.peer_comp_id = created_ctx.id;
+                peer_port_info.peer_port_id = created_port_info.self_id;
                 creator_ctx.add_peer(peer_port_handle, sched_ctx, created_ctx.id, None);
             }
         }