diff --git a/rpc/src/main/java/com/navercorp/pinpoint/rpc/client/PinpointSocketHandler.java b/rpc/src/main/java/com/navercorp/pinpoint/rpc/client/PinpointSocketHandler.java
index dd769dbe3f48..06111f675e5f 100644
--- a/rpc/src/main/java/com/navercorp/pinpoint/rpc/client/PinpointSocketHandler.java
+++ b/rpc/src/main/java/com/navercorp/pinpoint/rpc/client/PinpointSocketHandler.java
@@ -17,6 +17,7 @@
 package com.navercorp.pinpoint.rpc.client;
 
 import java.net.SocketAddress;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
@@ -186,7 +187,10 @@ public void channelConnected(ChannelHandlerContext ctx, ChannelStateEvent e) thr
         
         registerPing();
 
-        Map<String, Object> handshakeData = this.pinpointSocketFactory.getProperties();
+        Map<String, Object> handshakeData = new HashMap<String, Object>();
+        handshakeData.putAll(pinpointSocketFactory.getProperties());
+        handshakeData.put("socketId", socketId);
+        
         handshaker.handshakeStart(channel, handshakeData);
         
         connectFuture.setResult(Result.SUCCESS);