diff --git a/packages/auth/bin/server.ts b/packages/auth/bin/server.ts
index 214006e86..4c2464a53 100644
--- a/packages/auth/bin/server.ts
+++ b/packages/auth/bin/server.ts
@@ -43,7 +43,7 @@ void container.load().then((container) => {
     env.get('MODE', true) !== 'home-server' && env.get('MODE', true) !== 'self-hosted'
 
   if (isConfiguredForAWSProduction) {
-    AWSXRay.config([AWSXRay.plugins.EC2Plugin, AWSXRay.plugins.ECSPlugin])
+    AWSXRay.config([AWSXRay.plugins.ECSPlugin])
   }
 
   const server = new InversifyExpressServer(container)
diff --git a/packages/auth/src/Bootstrap/Container.ts b/packages/auth/src/Bootstrap/Container.ts
index d0f3ac071..6b239541a 100644
--- a/packages/auth/src/Bootstrap/Container.ts
+++ b/packages/auth/src/Bootstrap/Container.ts
@@ -354,7 +354,7 @@ export class ContainerConfigLoader {
         }
       }
       let snsClient = new SNSClient(snsConfig)
-      if (isConfiguredForAWSProduction && this.mode === 'server') {
+      if (isConfiguredForAWSProduction) {
         snsClient = captureAWSv3Client(snsClient)
       }
       container.bind<SNSClient>(TYPES.Auth_SNS).toConstantValue(snsClient)
@@ -372,7 +372,7 @@ export class ContainerConfigLoader {
         }
       }
       let sqsClient = new SQSClient(sqsConfig)
-      if (isConfiguredForAWSProduction && this.mode === 'server') {
+      if (isConfiguredForAWSProduction) {
         sqsClient = captureAWSv3Client(sqsClient)
       }
       container.bind<SQSClient>(TYPES.Auth_SQS).toConstantValue(sqsClient)