Index: uspace/srv/taskman/event.c
===================================================================
--- uspace/srv/taskman/event.c	(revision c64e2546fe54fc31b8b0a9fb0d0329692c51a930)
+++ uspace/srv/taskman/event.c	(revision fcc4f86d7fd9bed9d06c7a801f3f244ac6b14e20)
@@ -312,5 +312,8 @@
 
 	hash_table_remove_item(&task_hash_table, &t->link);
-	// TODO remove from listeners too!
+
+	fibril_rwlock_write_lock(&listeners_lock);
+	list_remove(&t->listeners);
+	fibril_rwlock_write_unlock(&listeners_lock);
 
 finish: