diff --git a/cli/ops/net.rs b/cli/ops/net.rs
index 5ccb62d6c8..2e627ddb95 100644
--- a/cli/ops/net.rs
+++ b/cli/ops/net.rs
@@ -161,6 +161,7 @@ fn receive_udp(
   Ok(JsonOp::Async(op.boxed_local()))
 }
 
+// TODO(ry) Rename to op_datagram_receive
 fn op_receive(
   isolate_state: &mut CoreIsolateState,
   state: &State,
@@ -191,6 +192,7 @@ struct SendArgs {
   transport_args: ArgsEnum,
 }
 
+// TODO(ry) Rename to op_datagram_send
 fn op_send(
   isolate_state: &mut CoreIsolateState,
   state: &State,
@@ -208,21 +210,21 @@ fn op_send(
       transport_args: ArgsEnum::Ip(args),
     } if transport == "udp" => {
       state.check_net(&args.hostname, args.port)?;
-
-      let op = async move {
+      let addr = resolve_addr(&args.hostname, args.port)?;
+      let f = poll_fn(move |cx| {
         let mut resource_table = resource_table.borrow_mut();
         let resource = resource_table
           .get_mut::<UdpSocketResource>(rid as u32)
           .ok_or_else(|| {
             OpError::bad_resource("Socket has been closed".to_string())
           })?;
-        let socket = &mut resource.socket;
-        let addr = resolve_addr(&args.hostname, args.port)?;
-        socket.send_to(&zero_copy, addr).await?;
-        Ok(json!({}))
-      };
-
-      Ok(JsonOp::Async(op.boxed_local()))
+        resource
+          .socket
+          .poll_send_to(cx, &zero_copy, &addr)
+          .map_err(OpError::from)
+          .map_ok(|_| json!({}))
+      });
+      Ok(JsonOp::Async(f.boxed_local()))
     }
     #[cfg(unix)]
     SendArgs {
diff --git a/cli/tests/unit/net_test.ts b/cli/tests/unit/net_test.ts
index 4fd253a6c9..cda5a536e4 100644
--- a/cli/tests/unit/net_test.ts
+++ b/cli/tests/unit/net_test.ts
@@ -254,6 +254,21 @@ unitTest(
   }
 );
 
+unitTest(
+  { ignore: Deno.build.os === "windows", perms: { net: true } },
+  async function netUdpBorrowMutError(): Promise<void> {
+    const socket = Deno.listenDatagram({
+      port: 4501,
+      transport: "udp",
+    });
+    // Panic happened on second send: BorrowMutError
+    const a = socket.send(new Uint8Array(), socket.addr);
+    const b = socket.send(new Uint8Array(), socket.addr);
+    await Promise.all([a, b]);
+    socket.close();
+  }
+);
+
 unitTest(
   { ignore: Deno.build.os === "windows", perms: { read: true, write: true } },
   async function netUnixPacketSendReceive(): Promise<void> {