diff --git a/include/haproxy/thread.h b/include/haproxy/thread.h
index dfdb33387..a66180ee5 100644
--- a/include/haproxy/thread.h
+++ b/include/haproxy/thread.h
@@ -223,14 +223,14 @@ extern THREAD_LOCAL unsigned int tgid;     /* The thread group id (starts at 1)
 static inline void ha_set_thread(const struct thread_info *thr)
 {
 	if (thr) {
-		BUG_ON(!thr->tid_bit);
+		BUG_ON(!thr->ltid_bit);
 		BUG_ON(!thr->tg);
 		BUG_ON(!thr->tg->tgid);
 
 		ti      = thr;
 		tg      = thr->tg;
 		tid     = thr->tid;
-		tid_bit = thr->tid_bit;
+		tid_bit = thr->ltid_bit;
 		th_ctx  = &ha_thread_ctx[tid];
 		tgid    = tg->tgid;
 	} else {
diff --git a/include/haproxy/tinfo-t.h b/include/haproxy/tinfo-t.h
index 4f3b9f629..b2395a4d5 100644
--- a/include/haproxy/tinfo-t.h
+++ b/include/haproxy/tinfo-t.h
@@ -62,7 +62,7 @@ struct tgroup_info {
 struct thread_info {
 	const struct tgroup_info *tg;     /* config of the thread-group this thread belongs to */
 	uint tid, ltid;                   /* process-wide and group-wide thread ID (start at 0) */
-	ulong tid_bit, ltid_bit;          /* bit masks for the tid/ltid */
+	ulong ltid_bit;                   /* bit masks for the tid/ltid */
 
 	/* pad to cache line (64B) */
 	char __pad[0];                    /* unused except to check remaining room */
diff --git a/src/thread.c b/src/thread.c
index 7318de973..9a0811bfd 100644
--- a/src/thread.c
+++ b/src/thread.c
@@ -1078,8 +1078,6 @@ int thread_map_to_groups()
 	for (t = 0; t < global.nbthread; t++) {
 		ha_thread_info[t].tid      = t;
 		ha_thread_info[t].ltid     = t - ha_thread_info[t].tg->base;
-
-		ha_thread_info[t].tid_bit  = 1UL << ha_thread_info[t].tid;
 		ha_thread_info[t].ltid_bit = 1UL << ha_thread_info[t].ltid;
 	}