Index: generic/src/ipc/ipc.c
===================================================================
--- generic/src/ipc/ipc.c	(revision 2ba78108c2b47014f0f5835ad107f014e6f9e4d0)
+++ generic/src/ipc/ipc.c	(revision 6a22fcb1d8d4c7fa9ad4454c62a6df536ba463f1)
@@ -185,4 +185,5 @@
 	answerbox_t *callerbox = request->callerbox;
 
+	request->flags &= ~IPC_CALL_DISPATCHED;
 	request->flags |= IPC_CALL_ANSWERED;
 
@@ -218,4 +219,5 @@
 			/* Append request to dispatch queue */
 			list_append(&request->list, &box->dispatched_calls);
+			request->flags |= IPC_CALL_DISPATCHED;
 		} else {
 			if (!(flags & IPC_WAIT_NONBLOCKING)) {