diff --git a/src/app/chat/[id]/page.tsx b/src/app/chat/[id]/page.tsx
index bcbda61..457f80d 100644
--- a/src/app/chat/[id]/page.tsx
+++ b/src/app/chat/[id]/page.tsx
@@ -22,6 +22,9 @@ export default function DMs() {
   const sendRequest = async (req: ClientMessage) => {
     console.log("Sending request:", req);
 
+    await targetNode.current?.waitUntilReady();
+    await app.node.current?.waitUntilReady();
+
     switch (req.type) {
       case "send_message":
         targetNode.current?.socket?.send(JSON.stringify(req));
diff --git a/src/components/channel/ChannelView.tsx b/src/components/channel/ChannelView.tsx
index bdad0ee..c019d6c 100644
--- a/src/components/channel/ChannelView.tsx
+++ b/src/components/channel/ChannelView.tsx
@@ -26,7 +26,8 @@ export default function ChannelView({
       <div className="h-svh w-full max-h-svh flex flex-col pb-5 pl-5 gap-5" />
     );
 
-  const sendRequest = (req: ClientMessage) => {
+  const sendRequest = async (req: ClientMessage) => {
+    await node.current?.waitUntilReady();
     node.current?.socket?.send(JSON.stringify(req));
     console.log(node.current?.socket);
   };
diff --git a/src/components/channel/PluginChannel.tsx b/src/components/channel/PluginChannel.tsx
index 465ac1d..afbf9bc 100644
--- a/src/components/channel/PluginChannel.tsx
+++ b/src/components/channel/PluginChannel.tsx
@@ -32,7 +32,8 @@ export default function PluginChannel({
       parentComm.sendToChild("MESSAGES", messages);
     });
 
-    parentComm.onMessage("SEND_MESSAGE", (msg: string) => {
+    parentComm.onMessage("SEND_MESSAGE", async (msg: string) => {
+      await node.current?.waitUntilReady();
       node.current?.socket?.send(
         JSON.stringify({
           type: "send_message",
diff --git a/src/lib/node.ts b/src/lib/node.ts
index 8b10c18..d5aadcd 100644
--- a/src/lib/node.ts
+++ b/src/lib/node.ts
@@ -21,6 +21,9 @@ export class NodeClient {
   private readonly serverId: string;
   private readonly messageStore: MessageStore;
   private readonly callbacks: NodeCallbacks;
+  private ready: boolean;
+  private readyPromise: Promise<void>;
+  private resolveReady!: () => void;
 
   constructor(
     serverId: string,
@@ -31,6 +34,10 @@ export class NodeClient {
     this.messageStore = messageStore;
     this.callbacks = callbacks;
     this.name = serverId;
+    this.ready = false;
+    this.readyPromise = new Promise((resolve) => {
+      this.resolveReady = resolve;
+    });
   }
 
   get socket() {
@@ -62,6 +69,11 @@ export class NodeClient {
     this.ws = null;
   }
 
+  async waitUntilReady() {
+    if (this.ready) return;
+    await this.readyPromise;
+  }
+
   private async handleMessage(e: MessageEvent, authToken: string) {
     // Voice packet
     if (e.data instanceof Blob) {
@@ -116,6 +128,9 @@ export class NodeClient {
             this.callbacks.onVoiceJoin?.(userId, channelId, voiceId)
           )
         );
+
+        this.ready = true;
+        this.resolveReady();
         break;
 
       case "message_create":