diff --git a/collector/src/main/resources-dev/pinpoint-collector.properties b/collector/src/main/resources-dev/pinpoint-collector.properties
index 4d3356515..b95c0c823 100644
--- a/collector/src/main/resources-dev/pinpoint-collector.properties
+++ b/collector/src/main/resources-dev/pinpoint-collector.properties
@@ -43,6 +43,6 @@ collector.udpSpanSocketReceiveBufferSize=4194304
 # 통계값 flush 주기
 statistics.flushPeriod=1000
 
-cluster.enable=false
-cluster.zookeeper.address=
-cluster.zookeeper.sessiontimeout=
\ No newline at end of file
+cluster.enable=true
+cluster.zookeeper.address=dev.zk.pinpoint.navercorp.com
+cluster.zookeeper.sessiontimeout=3000
\ No newline at end of file
diff --git a/collector/src/main/resources-release/pinpoint-collector.properties b/collector/src/main/resources-release/pinpoint-collector.properties
index 610706681..5c9f6b3c7 100644
--- a/collector/src/main/resources-release/pinpoint-collector.properties
+++ b/collector/src/main/resources-release/pinpoint-collector.properties
@@ -43,6 +43,6 @@ collector.udpSpanSocketReceiveBufferSize=4194304
 # 통계값 flush 주기
 statistics.flushPeriod=1000
 
-cluster.enable=false
-cluster.zookeeper.address=
-cluster.zookeeper.sessiontimeout=
\ No newline at end of file
+cluster.enable=true
+cluster.zookeeper.address=zk.pinpoint.nhncorp.com
+cluster.zookeeper.sessiontimeout=3000
\ No newline at end of file
diff --git a/profiler/src/main/java/com/navercorp/pinpoint/profiler/receiver/CommandDispatcher.java b/profiler/src/main/java/com/navercorp/pinpoint/profiler/receiver/CommandDispatcher.java
index 32f7d4804..7039ea6f2 100644
--- a/profiler/src/main/java/com/navercorp/pinpoint/profiler/receiver/CommandDispatcher.java
+++ b/profiler/src/main/java/com/navercorp/pinpoint/profiler/receiver/CommandDispatcher.java
@@ -26,6 +26,7 @@ import com.nhn.pinpoint.thrift.io.SerializerFactory;
 import com.nhn.pinpoint.thrift.io.TBaseLocator;
 import com.nhn.pinpoint.thrift.io.TCommandRegistry;
 import com.nhn.pinpoint.thrift.io.TCommandTypeVersion;
+import com.nhn.pinpoint.thrift.io.ThreadLocalHeaderTBaseSerializerFactory;
 
 /**
  * @author koo.taejin
@@ -43,8 +44,9 @@ public class CommandDispatcher implements MessageListener {
 	
 	private final TBaseBOLocator locator;
 
-    private final SerializerFactory serializerFactory = new HeaderTBaseSerializerFactory(true, HeaderTBaseSerializerFactory.DEFAULT_UDP_STREAM_MAX_SIZE, DEFAULT_PROTOCOL_FACTORY, commandTbaseLocator);
-	private final HeaderTBaseDeserializerFactory deserializerFactory = new HeaderTBaseDeserializerFactory(DEFAULT_PROTOCOL_FACTORY, commandTbaseLocator);
+    private final SerializerFactory serializerFactory = new ThreadLocalHeaderTBaseSerializerFactory(new HeaderTBaseSerializerFactory(true, HeaderTBaseSerializerFactory.DEFAULT_UDP_STREAM_MAX_SIZE, DEFAULT_PROTOCOL_FACTORY, commandTbaseLocator));
+    
+    private final HeaderTBaseDeserializerFactory deserializerFactory = new HeaderTBaseDeserializerFactory(DEFAULT_PROTOCOL_FACTORY, commandTbaseLocator);
 	
 	public CommandDispatcher() {
 		TBaseBORegistry registry = new TBaseBORegistry();
diff --git a/web/src/main/resources-dev/pinpoint-web.properties b/web/src/main/resources-dev/pinpoint-web.properties
index 068760332..97ae18060 100644
--- a/web/src/main/resources-dev/pinpoint-web.properties
+++ b/web/src/main/resources-dev/pinpoint-web.properties
@@ -1,5 +1,5 @@
 # dev
-cluster.enable=false
+cluster.enable=true
 cluster.web.tcp.port=9995
 cluster.zookeeper.address=dev.zk.pinpoint.navercorp.com
 cluster.zookeeper.sessiontimeout=3000
diff --git a/web/src/main/resources-release/pinpoint-web.properties b/web/src/main/resources-release/pinpoint-web.properties
index 05258dd45..32a12bce7 100644
--- a/web/src/main/resources-release/pinpoint-web.properties
+++ b/web/src/main/resources-release/pinpoint-web.properties
@@ -1,5 +1,5 @@
 # release
-cluster.enable=false
+cluster.enable=true
 cluster.web.tcp.port=9995
 cluster.zookeeper.address=zk.pinpoint.nhncorp.com
 cluster.zookeeper.sessiontimeout=3000