diff --git a/src/hlua.c b/src/hlua.c
index 6a9073e..0de6342 100644
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -1277,6 +1277,9 @@
 	HLUA_CLR_CTRLYIELD(lua);
 	HLUA_CLR_WAKERESWR(lua);
 	HLUA_CLR_WAKEREQWR(lua);
+	HLUA_CLR_NOYIELD(lua);
+	if (!yield_allowed)
+		HLUA_SET_NOYIELD(lua);
 
 	/* Update the start time and reset wake_time. */
 	lua->start_time = now_ms;