diff --git a/lib/cpp/src/server/TNonblockingServer.cpp b/lib/cpp/src/server/TNonblockingServer.cpp
index 45f635c..32f021a 100644
--- a/lib/cpp/src/server/TNonblockingServer.cpp
+++ b/lib/cpp/src/server/TNonblockingServer.cpp
@@ -591,6 +591,9 @@
 
     // Put this client connection into the proper state
     clientConnection->transition();
+
+    // addrLen is written by the accept() call, so needs to be set before the next call.
+    addrLen = sizeof(addr);
   }
 
   // Done looping accept, now we have to make sure the error is due to