diff --git a/include/spawn/rpc_server.h b/include/spawn/rpc_server.h
index aae84d6..9bda61a 100644
--- a/include/spawn/rpc_server.h
+++ b/include/spawn/rpc_server.h
@@ -5,7 +5,6 @@
 
 struct aos_rpc_server {
     struct lmp_chan *chan;
-    struct waitset ws;
     void *shared_mem;
 
     struct capref ret_cap;
diff --git a/lib/spawn/rpc_server.c b/lib/spawn/rpc_server.c
index 7c2301d..c88ac4a 100644
--- a/lib/spawn/rpc_server.c
+++ b/lib/spawn/rpc_server.c
@@ -76,7 +76,7 @@ static void rpc_server_send_reply(void *arg) {
             return;
         }
         // Cannot send right now, try again later
-        err = lmp_chan_register_send(rpc->chan, &rpc->ws, MKCLOSURE(rpc_server_send_reply, arg));
+        err = lmp_chan_register_send(rpc->chan, get_default_waitset(), MKCLOSURE(rpc_server_send_reply, arg));
         if (err_is_fail(err)) {
             DEBUG_ERR(err, "Could not register send handler");
             return;