diff --git a/qrexec-lib/txrx-vchan.c b/qrexec-lib/txrx-vchan.c
index 6d372df..b3d252e 100644
--- a/qrexec-lib/txrx-vchan.c
+++ b/qrexec-lib/txrx-vchan.c
@@ -60,6 +60,8 @@ int wait_for_vchan_or_argfd_once(libvchan_t *ctrl, int max, fd_set * rdset, fd_s
 		// the following will never block; we need to do this to
 		// clear libvchan_fd pending state 
 		libvchan_wait(ctrl);
+	if (libvchan_data_ready(ctrl))
+		return 1;
 	return ret;
 }