diff --git a/syscall.c b/syscall.c
index 0958e1b..fa9c454 100644
--- a/syscall.c
+++ b/syscall.c
@@ -1013,6 +1013,14 @@
 	 * We only need to grab the syscall number on syscall entry.
 	 */
 	if (regs.ARM_ip == 0) {
+		if (!(tcp->flags & TCB_INSYSCALL)) {
+			/* Check if we return from execve. */
+			if (tcp->flags & TCB_WAITEXECVE) {
+				tcp->flags &= ~TCB_WAITEXECVE;
+				return 0;
+			}
+		}
+
 		/*
 		 * Note: we only deal with only 32-bit CPUs here.
 		 */