diff --git a/src/conn.c b/src/conn.c
index e468c24..2dbb6e0 100644
--- a/src/conn.c
+++ b/src/conn.c
@@ -880,7 +880,6 @@ conn_loop(void)
                   conn_tty_start(&tty, curconn);
               }
           }
-          curconn = queue_next_elem(&queue, curconn);
           break;
         case CONN_RESP:
           if (FD_ISSET(curconn->sd, &sdsetwr))
@@ -912,9 +911,9 @@ conn_loop(void)
             if (curconn->ctr == (MB_FRAME(curconn->buf, MB_LENGTH_L) + HDRSIZE))
               state_conn_set(curconn, CONN_HEADER);
           }
-          curconn = queue_next_elem(&queue, curconn);
           break;
       } /* switch (curconn->state) */
+      curconn = queue_next_elem(&queue, curconn);
     } /* while (len--) */
   } /* while (TRUE) */