diff --git a/include/proto/task.h b/include/proto/task.h
index 4044bd4..ae8fbab 100644
--- a/include/proto/task.h
+++ b/include/proto/task.h
@@ -103,6 +103,8 @@
 __decl_hathreads(extern HA_SPINLOCK_T rq_lock);  /* spin lock related to run queue */
 __decl_hathreads(extern HA_RWLOCK_T wq_lock);    /* RW lock related to the wait queue */
 
+static inline struct task *task_unlink_wq(struct task *t);
+static inline void task_queue(struct task *task);
 
 /* return 0 if task is in run queue, otherwise non-zero */
 static inline int task_in_rq(struct task *t)
@@ -151,7 +153,11 @@
 /* change the thread affinity of a task to <thread_mask> */
 static inline void task_set_affinity(struct task *t, unsigned long thread_mask)
 {
+	if (task_in_wq(t))
+		task_unlink_wq(t);
 	t->thread_mask = thread_mask;
+	if (t->expire != TICK_ETERNITY)
+		task_queue(t);
 }
 
 /*