diff --git a/executer/kernel/control.c b/executer/kernel/control.c
index 3a3bd6ae..e6c5fb92 100644
--- a/executer/kernel/control.c
+++ b/executer/kernel/control.c
@@ -407,6 +407,10 @@ retry_alloc:
 
 	ret = wait_event_interruptible(wqhln->wq_syscall, wqhln->req);
 	
+	if (ret) {
+		return -EINTR;
+	}
+
 	/* Remove per-process wait queue head */
 	irqflags = ihk_ikc_spinlock_lock(&c->wq_list_lock);
 	list_del(&wqhln->list);
@@ -425,10 +429,6 @@ retry_alloc:
 		return -EINTR;
 	}
 
-	if (ret) {
-		return -EINTR;
-	}
-
 #if 1
 	mb();
 	if (!c->param.request_va->valid) {