diff --git a/Endpoint/Controllers/V1/AuthController.cs b/Endpoint/Controllers/V1/AuthController.cs
index 2b01b54..b7c49f3 100644
--- a/Endpoint/Controllers/V1/AuthController.cs
+++ b/Endpoint/Controllers/V1/AuthController.cs
@@ -199,7 +199,7 @@ public class AuthController(IOptionsSnapshot<Admin> user, IOptionsSnapshot<Gener
                         Detail = "The user is not logged in to link accounts.",
                         Extensions = new Dictionary<string, object?>()
                         {
-                            { "traceId", HttpContext.TraceIdentifier }
+                            { "traceId", Activity.Current?.Id ?? HttpContext.TraceIdentifier }
                         }
                     });
 
@@ -212,7 +212,7 @@ public class AuthController(IOptionsSnapshot<Admin> user, IOptionsSnapshot<Gener
                         Detail = "This OAuth provider is already associated with the account.",
                         Extensions = new Dictionary<string, object?>()
                         {
-                            { "traceId", HttpContext.TraceIdentifier }
+                            { "traceId", Activity.Current?.Id ?? HttpContext.TraceIdentifier }
                         }
                     });