diff --git a/src/sbbs3/websrvr.c b/src/sbbs3/websrvr.c
index ad39b740eceac43094f3da63e11eed5ed42d4a95..cd561ac3efb8a00b3119b053f89f14040d4a81ae 100644
--- a/src/sbbs3/websrvr.c
+++ b/src/sbbs3/websrvr.c
@@ -453,8 +453,9 @@ static int sockprintf(SOCKET sock, char *fmt, ...)
 	while((result=sendsocket(sock,sbuf,len))!=len) {
 		if(result==SOCKET_ERROR) {
 			if(ERROR_VALUE==EWOULDBLOCK) {
-				YIELD();
-				continue;
+				/* Do a select() instead of an arbitrary YIELD() */
+				if(select(sock+1,NULL,&socket_set,NULL,&tv)>=0)
+					continue;
 			}
 			if(ERROR_VALUE==ECONNRESET) 
 				lprintf("%04d Connection reset by peer on send",sock);