diff --git a/src/backend/replication/walreceiver.c b/src/backend/replication/walreceiver.c
index d257caf913..7005307dc2 100644
--- a/src/backend/replication/walreceiver.c
+++ b/src/backend/replication/walreceiver.c
@@ -324,6 +324,9 @@ WalRcvDie(int code, Datum arg)
 	/* use volatile pointer to prevent code rearrangement */
 	volatile WalRcvData *walrcv = WalRcv;
 
+	/* Ensure that all WAL records received are flushed to disk */
+	XLogWalRcvFlush();
+
 	SpinLockAcquire(&walrcv->mutex);
 	Assert(walrcv->walRcvState == WALRCV_RUNNING ||
 		   walrcv->walRcvState == WALRCV_STOPPING);