diff --git a/lib/lws-plat-win.c b/lib/lws-plat-win.c
index 9ed6528b..5176f1c0 100644
--- a/lib/lws-plat-win.c
+++ b/lib/lws-plat-win.c
@@ -164,7 +164,10 @@ lws_plat_service(struct lws_context *context, int timeout_ms)
 			pfd->revents = LWS_POLLOUT;
 			n = lws_service_fd(context, pfd);
 			if (n < 0)
-				return n;
+				return -1;
+			/* if something closed, retry this slot */
+			if (n)
+				i--;
 		}
 	}