diff --git a/backend/mpc-system/services/server-party/adapters/output/grpc/message_router_client.go b/backend/mpc-system/services/server-party/adapters/output/grpc/message_router_client.go index 05241808..ad5aeacd 100644 --- a/backend/mpc-system/services/server-party/adapters/output/grpc/message_router_client.go +++ b/backend/mpc-system/services/server-party/adapters/output/grpc/message_router_client.go @@ -268,7 +268,8 @@ func (c *MessageRouterClient) GetPendingMessages( // Send acknowledgment for each received message go func(messageID, sessionIDStr, pID string) { - ackCtx, cancel := context.WithTimeout(context.Background(), 5*time.Second) + // Use parent context to allow proper cancellation + ackCtx, cancel := context.WithTimeout(ctx, 5*time.Second) defer cancel() sid, _ := uuid.Parse(sessionIDStr) if err := c.AcknowledgeMessage(ackCtx, messageID, sid, pID, true, ""); err != nil {