diff --git a/dap-gateway/src/main/java/io/shinhanlife/dap/mcg/service/ExecuteService.java b/dap-gateway/src/main/java/io/shinhanlife/dap/mcg/service/ExecuteService.java
index c735d8a..0620405 100644
--- a/dap-gateway/src/main/java/io/shinhanlife/dap/mcg/service/ExecuteService.java
+++ b/dap-gateway/src/main/java/io/shinhanlife/dap/mcg/service/ExecuteService.java
@@ -233,8 +233,8 @@ public class ExecuteService {
                     String executeApiUrl = targetUrl + "/mcp/" + metadata.getName();
                     
                     Map<String, String> headers = new java.util.HashMap<>();
-                    headers.put("trace-id", java.util.UUID.randomUUID().toString());
-                    headers.put("request-id", context.requestId());
+                    headers.put("trace-id", context.requestId());
+                    headers.put("request-id", java.util.UUID.randomUUID().toString());
                     
                     ObjectNode pageArguments = paginationValidator.normalize(arguments);
                     LargeToolResponseService.Collector collector = largeResponses.newCollector(metadata.getName(), context.requestId());