diff --git a/src/backend/port/unix_latch.c b/src/backend/port/unix_latch.c
index 30d1a488f0..409beaed8d 100644
--- a/src/backend/port/unix_latch.c
+++ b/src/backend/port/unix_latch.c
@@ -293,7 +293,7 @@ WaitLatchOrSocket(volatile Latch *latch, int wakeEvents, pgsocket sock,
 			result |= WL_TIMEOUT;
 		}
 		if ((wakeEvents & WL_SOCKET_READABLE) &&
-			(pfds[0].revents & POLLIN))
+			(pfds[0].revents & (POLLIN | POLLHUP | POLLERR | POLLNVAL)))
 		{
 			/* data available in socket */
 			result |= WL_SOCKET_READABLE;