diff --git a/service/application/src/main/java/com/solace/maas/ep/event/management/agent/subscriber/BaseSolaceMessageHandler.java b/service/application/src/main/java/com/solace/maas/ep/event/management/agent/subscriber/BaseSolaceMessageHandler.java
index 9c465ef7..5e24450c 100644
--- a/service/application/src/main/java/com/solace/maas/ep/event/management/agent/subscriber/BaseSolaceMessageHandler.java
+++ b/service/application/src/main/java/com/solace/maas/ep/event/management/agent/subscriber/BaseSolaceMessageHandler.java
@@ -47,7 +47,6 @@ protected static void setupMDC(String messageAsString, String receivedClassName)
         MDC.clear();
         MDC.put(RouteConstants.TRACE_ID, map.get("traceId"));
         MDC.put(RouteConstants.ACTOR_ID, map.get("actorId"));
-        MDC.put(RouteConstants.EVENT_MANAGEMENT_ID, map.get("runtimeAgentId"));
 
         if (scanClassNames.contains(receivedClassName)) {
             MDC.put(RouteConstants.SCAN_ID, map.get("scanId"));
diff --git a/service/application/src/main/resources/logback-spring.xml b/service/application/src/main/resources/logback-spring.xml
index 80b50fa7..2dbe66f7 100644
--- a/service/application/src/main/resources/logback-spring.xml
+++ b/service/application/src/main/resources/logback-spring.xml
@@ -26,7 +26,7 @@
         <if condition='property("USE_JSON").equals("true")'>
             <then>
                 <encoder class="net.logstash.logback.encoder.LogstashEncoder">
-                    <customFields>{"component":"event-management-agent-${agentId}"}</customFields>
+                    <customFields>{"component":"event-management-agent-${agentId}", "ema_id":"${agentId}"}</customFields>
                     <providers>
                         <stackTrace>
                             <fieldName>stackTrace</fieldName>