2 files changed, 2 insertions, 7 deletions
diff --git a/src/nvim/msgpack_rpc/channel.c b/src/nvim/msgpack_rpc/channel.c
index 0e3b8200c9..d8f86cefab 100644
--- a/src/nvim/msgpack_rpc/channel.c
+++ b/src/nvim/msgpack_rpc/channel.c
@@ -93,11 +93,6 @@ void channel_init(void)
   channels = pmap_new(uint64_t)();
   event_strings = pmap_new(cstr_t)();
   msgpack_sbuffer_init(&out_buffer);
-
-  if (embedded_mode) {
-    channel_from_stdio();
-  }
-
   remote_ui_init();
 }
 
@@ -316,7 +311,7 @@ bool channel_close(uint64_t id)
 
 /// Creates an API channel from stdin/stdout. This is used when embedding
 /// Neovim
-static void channel_from_stdio(void)
+void channel_from_stdio(void)
 {
   Channel *channel = register_channel(kChannelTypeStdio);
   incref(channel);  // stdio channels are only closed on exit
diff --git a/src/nvim/msgpack_rpc/remote_ui.c b/src/nvim/msgpack_rpc/remote_ui.c
index 403ac13f2f..f0d92b52a0 100644
--- a/src/nvim/msgpack_rpc/remote_ui.c
+++ b/src/nvim/msgpack_rpc/remote_ui.c
@@ -28,7 +28,7 @@ void remote_ui_init(void)
   connected_uis = pmap_new(uint64_t)();
   // Add handler for "attach_ui"
   String method = cstr_as_string("ui_attach");
-  MsgpackRpcRequestHandler handler = {.fn = remote_ui_attach, .async = true};
+  MsgpackRpcRequestHandler handler = {.fn = remote_ui_attach, .async = false};
   msgpack_rpc_add_method_handler(method, handler);
   method = cstr_as_string("ui_detach");
   handler.fn = remote_ui_detach;