diff --git a/include/haproxy/listener-t.h b/include/haproxy/listener-t.h
index 58dce2fe5..0f6adde3a 100644
--- a/include/haproxy/listener-t.h
+++ b/include/haproxy/listener-t.h
@@ -236,7 +236,7 @@ struct listener {
 	struct mt_list wait_queue;	/* link element to make the listener wait for something (LI_LIMITED)  */
 	char *name;			/* listener's name */
 
-	unsigned int thr_conn[MAX_THREADS]; /* number of connections per thread */
+	unsigned int thr_conn[MAX_THREADS_PER_GROUP]; /* number of connections per thread for the group */
 
 	struct list by_fe;              /* chaining in frontend's list of listeners */
 	struct list by_bind;            /* chaining in bind_conf's list of listeners */
diff --git a/src/listener.c b/src/listener.c
index 47cf42634..2e373a361 100644
--- a/src/listener.c
+++ b/src/listener.c
@@ -141,7 +141,7 @@ struct task *accept_queue_process(struct task *t, void *context, unsigned int st
 			break;
 
 		li = __objt_listener(conn->target);
-		_HA_ATOMIC_INC(&li->thr_conn[tid]);
+		_HA_ATOMIC_INC(&li->thr_conn[ti->ltid]);
 		ret = li->bind_conf->accept(conn);
 		if (ret <= 0) {
 			/* connection was terminated by the application */
@@ -1170,8 +1170,8 @@ void listener_accept(struct listener *l)
 				 *             than t2.
 				 */
 
-				q1 += l->thr_conn[base + t1];
-				q2 += l->thr_conn[base + t2];
+				q1 += l->thr_conn[t1];
+				q2 += l->thr_conn[t2];
 
 				if (q1 - q2 < 0) {
 					t = t1;
@@ -1214,7 +1214,7 @@ void listener_accept(struct listener *l)
 #endif // USE_THREAD
 
  local_accept:
-		_HA_ATOMIC_INC(&l->thr_conn[tid]);
+		_HA_ATOMIC_INC(&l->thr_conn[ti->ltid]);
 		ret = l->bind_conf->accept(cli_conn);
 		if (unlikely(ret <= 0)) {
 			/* The connection was closed by stream_accept(). Either
@@ -1319,7 +1319,7 @@ void listener_release(struct listener *l)
 	if (fe)
 		_HA_ATOMIC_DEC(&fe->feconn);
 	_HA_ATOMIC_DEC(&l->nbconn);
-	_HA_ATOMIC_DEC(&l->thr_conn[tid]);
+	_HA_ATOMIC_DEC(&l->thr_conn[ti->ltid]);
 
 	if (l->state == LI_FULL || l->state == LI_LIMITED)
 		relax_listener(l, 0, 0);