diff --git a/src/main/java/com/yahoo/omid/tso/TSOHandler.java b/src/main/java/com/yahoo/omid/tso/TSOHandler.java
index 2397f8a..5d6a2b2 100644
--- a/src/main/java/com/yahoo/omid/tso/TSOHandler.java
+++ b/src/main/java/com/yahoo/omid/tso/TSOHandler.java
@@ -204,17 +204,14 @@ public void handle(TimestampRequest msg, ChannelHandlerContext ctx) {
         synchronized (messageBuffersMap) {
             buffer = messageBuffersMap.get(ctx.getChannel());
             if (buffer == null) {
-//                synchronized (sharedState) {
-                    synchronized (sharedMsgBufLock) {
-                        bootstrap = true;
-                        channel = ctx.getChannel();
-                        buffer = sharedState.sharedMessageBuffer.new ReadingBuffer(channel);
-                        messageBuffersMap.put(channel, buffer);
-                        channelGroup.add(channel);
-//                        clientChannels.add(channel);
-                        LOG.warn("Channel connected: " + messageBuffersMap.size());
-                    }
-//                }
+                 synchronized (sharedMsgBufLock) {
+                     bootstrap = true;
+                     channel = ctx.getChannel();
+                     buffer = sharedState.sharedMessageBuffer.new ReadingBuffer(channel);
+                     messageBuffersMap.put(channel, buffer);
+                     channelGroup.add(channel);
+                     LOG.warn("Channel connected: " + messageBuffersMap.size());
+                 }
             }
         }
         if (bootstrap) {