diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c
index 3c1427d..5fa8877 100644
--- a/src/ngircd/conn.c
+++ b/src/ngircd/conn.c
@@ -1871,6 +1871,10 @@ Handle_Buffer(CONN_ID Idx)
 	}
 
 	for (i=0; i < maxcmd; i++) {
+		/* Check for running subprocess, e.g. resolver */
+		if (Proc_InProgress(&My_Connections[Idx].proc_stat))
+			return 0;
+
 		/* Check penalty */
 		if (My_Connections[Idx].delaytime > starttime)
 			return 0;