diff --git a/kernel/port.c b/kernel/port.c
index 871b4c6..84346e8 100644
--- a/kernel/port.c
+++ b/kernel/port.c
@@ -103,5 +103,9 @@ kern_status_t port_send_msg(
 
 	wait_for_reply(msg, lock_flags);
 
+	channel_lock_irqsave(port->p_remote, &flags);
+	btree_delete(&port->p_remote->c_msg, &msg->msg_node);
+	channel_unlock_irqrestore(port->p_remote, flags);
+
 	return msg->msg_result;
 }