diff --git a/packages/domain-events-infra/src/Infra/SQS/SQSXRayEventMessageHandler.ts b/packages/domain-events-infra/src/Infra/SQS/SQSXRayEventMessageHandler.ts
index 4e5bc6959..51c42b388 100644
--- a/packages/domain-events-infra/src/Infra/SQS/SQSXRayEventMessageHandler.ts
+++ b/packages/domain-events-infra/src/Infra/SQS/SQSXRayEventMessageHandler.ts
@@ -32,24 +32,13 @@ export class SQSXRayEventMessageHandler implements DomainEventMessageHandlerInte
 
     this.logger.debug(`Received event: ${domainEvent.type}`)
 
-    const xRaySegment = new Segment(domainEvent.type)
+    await captureAsyncFunc(domainEvent.type, async (subsegment?: Subsegment) => {
+      await handler.handle(domainEvent)
 
-    if (domainEvent.meta.correlation.userIdentifierType === 'uuid') {
-      xRaySegment.setUser(domainEvent.meta.correlation.userIdentifier)
-    }
-
-    await captureAsyncFunc(
-      `${handler.constructor.name}.handle}`,
-      async (subsegment?: Subsegment) => {
-        await handler.handle(domainEvent)
-
-        if (subsegment) {
-          subsegment.close()
-        }
-        xRaySegment.close()
-      },
-      xRaySegment,
-    )
+      if (subsegment) {
+        subsegment.close()
+      }
+    })
   }
 
   async handleError(error: Error): Promise<void> {