diff --git a/src/mux_h2.c b/src/mux_h2.c
index f22e0e1..959bcfb 100644
--- a/src/mux_h2.c
+++ b/src/mux_h2.c
@@ -5182,9 +5182,11 @@
 		sw = param;
 		if (h2s->send_wait == sw) {
 			sw->events &= ~SUB_CALL_UNSUBSCRIBE;
+			task_remove_from_task_list((struct task *)h2s->send_wait->task);
 			h2s->send_wait = NULL;
 			LIST_DEL(&h2s->list);
 			LIST_INIT(&h2s->list);
+			LIST_DEL_INIT(&h2s->sending_list);
 		}
 	}
 	return 0;