diff --git a/src/backend/replication/walsender.c b/src/backend/replication/walsender.c
index cdd9c6a5334..a0338da0d46 100644
--- a/src/backend/replication/walsender.c
+++ b/src/backend/replication/walsender.c
@@ -1100,7 +1100,7 @@ WalSndLoop(void)
 					ping_sent = true;
 					/* Try to flush pending output to the client */
 					if (pq_flush_if_writable() != 0)
-						break;
+						goto send_failure;
 				}
 			}