diff --git a/src/lib/server/ClientListener.cpp b/src/lib/server/ClientListener.cpp
index c202bd585..3219f6d64 100644
--- a/src/lib/server/ClientListener.cpp
+++ b/src/lib/server/ClientListener.cpp
@@ -235,9 +235,8 @@ void ClientListener::cleanupListenSocket()
 
 void ClientListener::cleanupClientSockets()
 {
-  ClientSockets::iterator it;
-  for (it = m_clientSockets.begin(); it != m_clientSockets.end(); it++) {
-    delete *it;
+  for (auto client : m_clientSockets) {
+    delete client;
   }
   m_clientSockets.clear();
 }