diff -Nurd postgresql-9.5.1.orig/src/backend/replication/walsender.c postgresql-9.5.1/src/backend/replication/walsender.c
--- postgresql-9.5.1.orig/src/backend/replication/walsender.c	2016-02-08 21:12:28.000000000 +0000
+++ postgresql-9.5.1/src/backend/replication/walsender.c	2016-03-11 11:56:41.121361222 +0000
@@ -2502,8 +2502,10 @@
 
 		proc_exit(0);
 	}
-	if (!waiting_for_ping_response)
+	if (!waiting_for_ping_response) {
 		WalSndKeepalive(true);
+		waiting_for_ping_response = true;
+	}
 }
 
 /*