diff --git a/api-gateway/src/main/java/kr/mafoo/gateway/ApiGatewayApplication.java b/api-gateway/src/main/java/kr/mafoo/gateway/ApiGatewayApplication.java
index 9668b419..9bff3fbc 100644
--- a/api-gateway/src/main/java/kr/mafoo/gateway/ApiGatewayApplication.java
+++ b/api-gateway/src/main/java/kr/mafoo/gateway/ApiGatewayApplication.java
@@ -2,11 +2,13 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import reactor.core.publisher.Hooks;
 
 @SpringBootApplication
 public class ApiGatewayApplication {
 
 	public static void main(String[] args) {
+		Hooks.enableAutomaticContextPropagation();
 		SpringApplication.run(ApiGatewayApplication.class, args);
 	}
 
diff --git a/api-gateway/src/main/java/kr/mafoo/gateway/TracingConfig.java b/api-gateway/src/main/java/kr/mafoo/gateway/TracingConfig.java
index 2746c2a7..15f10745 100644
--- a/api-gateway/src/main/java/kr/mafoo/gateway/TracingConfig.java
+++ b/api-gateway/src/main/java/kr/mafoo/gateway/TracingConfig.java
@@ -4,6 +4,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.http.HttpMethod;
 import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.http.server.reactive.observation.ServerRequestObservationContext;
 
@@ -18,6 +19,10 @@ ObservationPredicate noopServerRequestObservationPredicate() {
                 if(StringUtils.containsAny(requestURI, "actuator", "swagger", "api-docs")) {
                     return false;
                 }
+
+                if(servletRequest.getMethod() == HttpMethod.OPTIONS) {
+                    return false;
+                }
             }
             if (StringUtils.equalsAny(name,"spring.security.filterchains","spring.security.authorizations","spring.security.http.secured.requests")) {
                 return false;