diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index 35235821453..bf6aaae7615 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -2068,6 +2068,9 @@ keep_going:						/* We will come back to here until there is
 						closesocket(conn->sock);
 						conn->sock = -1;
 						conn->status = CONNECTION_NEEDED;
+						/* Discard any unread/unsent data */
+						conn->inStart = conn->inCursor = conn->inEnd = 0;
+						conn->outCount = 0;
 						goto keep_going;
 					}
 					else
@@ -2105,6 +2108,9 @@ keep_going:						/* We will come back to here until there is
 						closesocket(conn->sock);
 						conn->sock = -1;
 						conn->status = CONNECTION_NEEDED;
+						/* Discard any unread/unsent data */
+						conn->inStart = conn->inCursor = conn->inEnd = 0;
+						conn->outCount = 0;
 						goto keep_going;
 					}
 				}
@@ -2218,6 +2224,9 @@ keep_going:						/* We will come back to here until there is
 						closesocket(conn->sock);
 						conn->sock = -1;
 						conn->status = CONNECTION_NEEDED;
+						/* Discard any unread/unsent data */
+						conn->inStart = conn->inCursor = conn->inEnd = 0;
+						conn->outCount = 0;
 						goto keep_going;
 					}
 
@@ -2285,6 +2294,9 @@ keep_going:						/* We will come back to here until there is
 						closesocket(conn->sock);
 						conn->sock = -1;
 						conn->status = CONNECTION_NEEDED;
+						/* Discard any unread/unsent data */
+						conn->inStart = conn->inCursor = conn->inEnd = 0;
+						conn->outCount = 0;
 						goto keep_going;
 					}
 
@@ -2304,6 +2316,9 @@ keep_going:						/* We will come back to here until there is
 						closesocket(conn->sock);
 						conn->sock = -1;
 						conn->status = CONNECTION_NEEDED;
+						/* Discard any unread/unsent data */
+						conn->inStart = conn->inCursor = conn->inEnd = 0;
+						conn->outCount = 0;
 						goto keep_going;
 					}
 #endif
@@ -2467,6 +2482,9 @@ keep_going:						/* We will come back to here until there is
 							closesocket(conn->sock);
 							conn->sock = -1;
 							conn->status = CONNECTION_NEEDED;
+							/* Discard any unread/unsent data */
+							conn->inStart = conn->inCursor = conn->inEnd = 0;
+							conn->outCount = 0;
 							goto keep_going;
 						}
 					}