diff --git a/src/runtime/setup.rs b/src/runtime/setup.rs
index 701228314b31045c8fbdd3db4187345179253120..53556e16b76f60bd91f77ee79d2fdd5a2f8704fb 100644
--- a/src/runtime/setup.rs
+++ b/src/runtime/setup.rs
@@ -494,6 +494,7 @@ fn setup_endpoints_and_pair_ports(
                             .expect("Net Setup's getter port info isn't known"); // unreachable
                         if event.is_writable() && !net_todo.sent_local_port {
                             // can write and didn't send setup msg yet? Do so!
+                            let _ = net_endpoint.stream.set_nodelay(true);
                             let msg = Msg::SetupMsg(SetupMsg::MyPortInfo(MyPortInfo {
                                 owner: local_info.owner,
                                 polarity: local_info.polarity,