diff --git a/src/unix-manager.c b/src/unix-manager.c
index 5fc0054bc6..2d0a90641a 100644
--- a/src/unix-manager.c
+++ b/src/unix-manager.c
@@ -495,6 +495,7 @@ int UnixMain(UnixCommand * this)
     int ret;
     fd_set select_set;
     UnixClient *uclient;
+    UnixClient *tclient;
 
     /* Wait activity on the socket */
     FD_ZERO(&select_set);
@@ -526,7 +527,7 @@ int UnixMain(UnixCommand * this)
         return 1;
     }
 
-    TAILQ_FOREACH(uclient, &this->clients, next) {
+    TAILQ_FOREACH_SAFE(uclient, &this->clients, next, tclient) {
         if (FD_ISSET(uclient->fd, &select_set)) {
             UnixCommandRun(this, uclient);
         }