diff --git a/src/main/java/com/nhn/pinpoint/collector/handler/SpanChunkHandler.java b/src/main/java/com/nhn/pinpoint/collector/handler/SpanChunkHandler.java
index 73b9133c2..8499fb266 100644
--- a/src/main/java/com/nhn/pinpoint/collector/handler/SpanChunkHandler.java
+++ b/src/main/java/com/nhn/pinpoint/collector/handler/SpanChunkHandler.java
@@ -41,6 +41,10 @@ public class SpanChunkHandler implements SimpleHandler {
 			if (logger.isDebugEnabled()) {
 				logger.debug("Received SpanChunk={}", spanChunk);
 			}
+            String traceAgentId = spanChunk.getTraceAgentId();
+            if (traceAgentId == null) {
+                spanChunk.setTraceAgentId(spanChunk.getAgentId());
+            }
 
 			traceDao.insertSpanChunk(spanChunk);
 
diff --git a/src/main/java/com/nhn/pinpoint/collector/handler/SpanEventHandler.java b/src/main/java/com/nhn/pinpoint/collector/handler/SpanEventHandler.java
index 24fab8d7b..77fb8ad4b 100644
--- a/src/main/java/com/nhn/pinpoint/collector/handler/SpanEventHandler.java
+++ b/src/main/java/com/nhn/pinpoint/collector/handler/SpanEventHandler.java
@@ -38,6 +38,10 @@ public class SpanEventHandler implements SimpleHandler {
 			if (logger.isDebugEnabled()) {
 				logger.debug("Received SpanEvent={}", spanEvent);
 			}
+            String traceAgentId = spanEvent.getTraceAgentId();
+            if (traceAgentId == null) {
+                spanEvent.setTraceAgentId(spanEvent.getAgentKey().getAgentId());
+            }
 
 			traceDao.insertEvent(spanEvent);
 
diff --git a/src/main/java/com/nhn/pinpoint/collector/handler/SpanHandler.java b/src/main/java/com/nhn/pinpoint/collector/handler/SpanHandler.java
index 4adc2ece6..7317065ad 100644
--- a/src/main/java/com/nhn/pinpoint/collector/handler/SpanHandler.java
+++ b/src/main/java/com/nhn/pinpoint/collector/handler/SpanHandler.java
@@ -44,12 +44,15 @@ public class SpanHandler implements SimpleHandler {
 
 		try {
 			TSpan span = (TSpan) tbase;
-
 			if (logger.isDebugEnabled()) {
 				logger.debug("Received SPAN={}", span);
 			}
+            String traceAgentId = span.getTraceAgentId();
+            if (traceAgentId == null) {
+                span.setTraceAgentId(span.getAgentId());
+            }
 
-			traceDao.insert(span);
+            traceDao.insert(span);
 //			traceIndexDao.insert(span);
 			applicationTraceIndexDao.insert(span);