Index: kernel/generic/src/ipc/ipc.c
===================================================================
--- kernel/generic/src/ipc/ipc.c	(revision 86939b1cfc4e60d1449f2f92c6a1e36462943230)
+++ kernel/generic/src/ipc/ipc.c	(revision 9a82ac14ae76a4fe733f31b3094ecfa40fed6e8f)
@@ -186,4 +186,11 @@
 	}
 
+	/*
+	 * Remove the call from the sender's active call list.
+	 */
+	spinlock_lock(&call->sender->active_calls_lock);
+	list_remove(&call->ta_link);
+	spinlock_unlock(&call->sender->active_calls_lock);
+
 	call->data.task_id = TASK->taskid;
 	
@@ -429,11 +436,4 @@
 		list_remove(&request->ab_link);
 		atomic_dec(&request->data.phone->active_calls);
-
-		/*
-		 * Remove the call from this task's active call list.
-		 */
-		spinlock_lock(&TASK->active_calls_lock);
-		list_remove(&request->ta_link);
-		spinlock_unlock(&TASK->active_calls_lock);
 	} else if (!list_empty(&box->calls)) {
 		/* Count received call */