Index: kernel/generic/src/proc/thread.c
===================================================================
--- kernel/generic/src/proc/thread.c	(revision 597fa246c9481b40ae4d512256c4ceea4506b215)
+++ kernel/generic/src/proc/thread.c	(revision 2df21755623b239a0d57f0639a0bfcf636cd3d5b)
@@ -446,5 +446,5 @@
 			 */
 			ipc_cleanup();
-			sys_waitq_task_cleanup();
+			caps_task_clear(TASK);
 			LOG("Cleanup of task %" PRIu64 " completed.", TASK->taskid);
 		}