diff --git a/src/backend/distributed/connection/connection_management.c b/src/backend/distributed/connection/connection_management.c
index 64ec1904f..f8e4816ed 100644
--- a/src/backend/distributed/connection/connection_management.c
+++ b/src/backend/distributed/connection/connection_management.c
@@ -1046,8 +1046,15 @@ FinishConnectionListEstablishment(List *multiConnectionList)
 
 				continue;
 			}
-
+			bool beforePollSocket = PQsocket(connectionState->connection->pgConn);
 			bool connectionStateChanged = MultiConnectionStatePoll(connectionState);
+
+			if (beforePollSocket != PQsocket(connectionState->connection->pgConn))
+			{
+				/* rebuild the wait events if MultiConnectionStatePoll() changed the socket */
+				waitEventSetRebuild = true;
+			}
+
 			if (connectionStateChanged)
 			{
 				if (connectionState->phase != MULTI_CONNECTION_PHASE_CONNECTING)