diff --git a/aws-xray-recorder-sdk-core/src/main/java/com/amazonaws/xray/AWSXRayRecorder.java b/aws-xray-recorder-sdk-core/src/main/java/com/amazonaws/xray/AWSXRayRecorder.java
index f412a0e6..2a6b0213 100644
--- a/aws-xray-recorder-sdk-core/src/main/java/com/amazonaws/xray/AWSXRayRecorder.java
+++ b/aws-xray-recorder-sdk-core/src/main/java/com/amazonaws/xray/AWSXRayRecorder.java
@@ -167,10 +167,10 @@ public AWSXRayRecorder() {
         LambdaSegmentContextResolver lambdaSegmentContextResolver = new LambdaSegmentContextResolver();
         if (lambdaSegmentContextResolver.resolve() != null) {
             segmentContextResolverChain.addResolver(lambdaSegmentContextResolver);
+        } else {
+            segmentContextResolverChain.addResolver(new ThreadLocalSegmentContextResolver());
         }
         
-        segmentContextResolverChain.addResolver(new ThreadLocalSegmentContextResolver());
-
         segmentListeners = new ArrayList<>();
 
         awsRuntimeContext = new ConcurrentHashMap<>();