diff --git a/include/haproxy/task.h b/include/haproxy/task.h
index e4c93fc..d5cf3b1 100644
--- a/include/haproxy/task.h
+++ b/include/haproxy/task.h
@@ -369,18 +369,9 @@
 	tasklet_wakeup_on(tl, tl->tid);
 }
 
-/* Remove the tasklet from the tasklet list. The tasklet MUST already be there.
- * If unsure, use tasklet_remove_from_tasklet_list() instead. If used with a
- * plain task, the caller must update the task_list_size.
- * This should only be used by the thread that owns the tasklet, any other
- * thread should use tasklet_cancel().
+/* Try to remove a tasklet from the list. This call is inherently racy and may
+ * only be performed on the thread that was supposed to dequeue this tasklet.
  */
-static inline void __tasklet_remove_from_tasklet_list(struct tasklet *t)
-{
-	LIST_DEL_INIT(&t->list);
-	_HA_ATOMIC_SUB(&tasks_run_queue, 1);
-}
-
 static inline void tasklet_remove_from_tasklet_list(struct tasklet *t)
 {
 	if (MT_LIST_DEL((struct mt_list *)&t->list))
diff --git a/src/task.c b/src/task.c
index 93e3022..d1e06ce 100644
--- a/src/task.c
+++ b/src/task.c
@@ -458,10 +458,12 @@
 		t->calls++;
 		sched->current = t;
 
+		_HA_ATOMIC_SUB(&tasks_run_queue, 1);
+
 		if (TASK_IS_TASKLET(t)) {
 			state = _HA_ATOMIC_XCHG(&t->state, state);
 			__ha_barrier_atomic_store();
-			__tasklet_remove_from_tasklet_list((struct tasklet *)t);
+			LIST_DEL_INIT(&((struct tasklet *)t)->list);
 			process(t, ctx, state);
 			done++;
 			sched->current = NULL;
@@ -471,7 +473,7 @@
 
 		state = _HA_ATOMIC_XCHG(&t->state, state | TASK_RUNNING);
 		__ha_barrier_atomic_store();
-		__tasklet_remove_from_tasklet_list((struct tasklet *)t);
+		LIST_DEL_INIT(&((struct tasklet *)t)->list);
 
 		/* OK then this is a regular task */