diff --git a/src/main/java/bftsmart/communication/client/netty/NettyTOMMessageDecoder.java b/src/main/java/bftsmart/communication/client/netty/NettyTOMMessageDecoder.java
index d60454dd6..9269474f7 100644
--- a/src/main/java/bftsmart/communication/client/netty/NettyTOMMessageDecoder.java
+++ b/src/main/java/bftsmart/communication/client/netty/NettyTOMMessageDecoder.java
@@ -154,9 +154,10 @@ protected void decode(ChannelHandlerContext context, ByteBuf buffer, List<Object
                 sm.signed = true;
             }
 
-            if (!isClient) {                
-                rl.readLock().lock();                
-                if (!sessionTable.containsKey(sm.getSender())) {
+            if (!isClient) {
+                rl.readLock().lock();
+                if (!sessionTable.containsKey(sm.getSender()) ||
+                        !sessionTable.get(sm.getSender()).getChannel().equals(context.channel())) {
                     rl.readLock().unlock();
               
                     NettyClientServerSession cs = new NettyClientServerSession(