diff --git a/src/commands/buffers.ts b/src/commands/buffers.ts
index 08de589..eac40ba 100644
--- a/src/commands/buffers.ts
+++ b/src/commands/buffers.ts
@@ -107,7 +107,7 @@ export async function attach_to_remote_buffer(buffer_name: string, set_content?:
 	if (set_content) {
 		// make remote document match local content
 		let doc_len = remoteContent.length;
-		await buffer.send({ startIdx: 0, endIdx: doc_len, content: localContent });
+		buffer.send({ startIdx: 0, endIdx: doc_len, content: localContent });
 	} else {
 		// make local document match remote content
 		let doc_len = localContent.length;
@@ -130,7 +130,7 @@ export async function attach_to_remote_buffer(buffer_name: string, set_content?:
 		for (let change of event.contentChanges) {
 			if (skip_this !== undefined && change.text == skip_this) continue;
 			// LOGGER.info(`onDidChangeTextDocument(event: [${change.rangeOffset}, ${change.text}, ${change.rangeOffset + change.rangeLength}])`);
-			await buffer.send({
+			buffer.send({
 				startIdx: change.rangeOffset,
 				endIdx: change.rangeOffset + change.rangeLength,
 				content: change.text
diff --git a/src/commands/client.ts b/src/commands/client.ts
index ac0577a..2679ae2 100644
--- a/src/commands/client.ts
+++ b/src/commands/client.ts
@@ -96,7 +96,7 @@ export async function join(selected: vscode.TreeItem | undefined) {
 		let buffer = mapping.bufferMapper.by_editor(buf);
 		if (buffer === undefined) {
 			if (once) {
-				await controller.send({
+				controller.send({
 					startRow: 0,
 					startCol: 0,
 					endRow: 0,
@@ -107,7 +107,7 @@ export async function join(selected: vscode.TreeItem | undefined) {
 			once = false;
 		} else {
 
-			await controller.send({
+			controller.send({
 				startRow: selection.anchor.line,
 				startCol: selection.anchor.character,
 				endRow: selection.active.line,