diff --git a/src/bin/pg_basebackup/pg_recvlogical.c b/src/bin/pg_basebackup/pg_recvlogical.c
index 5f2e6af445..e33c204df0 100644
--- a/src/bin/pg_basebackup/pg_recvlogical.c
+++ b/src/bin/pg_basebackup/pg_recvlogical.c
@@ -55,6 +55,7 @@ static const char *plugin = "test_decoding";
 /* Global State */
 static int	outfd = -1;
 static volatile sig_atomic_t time_to_abort = false;
+static volatile sig_atomic_t interrupted = false;
 static volatile sig_atomic_t output_reopen = false;
 static bool output_isfile;
 static TimestampTz output_last_fsync = -1;
@@ -206,6 +207,7 @@ StreamLogicalLog(void)
 	char	   *copybuf = NULL;
 	TimestampTz last_status = -1;
 	int			i;
+	XLogRecPtr	cur_record_lsn = InvalidXLogRecPtr;
 	PQExpBuffer query;
 
 	output_written_lsn = InvalidXLogRecPtr;
@@ -275,7 +277,6 @@ StreamLogicalLog(void)
 		int			bytes_written;
 		TimestampTz now;
 		int			hdr_len;
-		XLogRecPtr	cur_record_lsn = InvalidXLogRecPtr;
 
 		if (copybuf != NULL)
 		{
@@ -487,7 +488,7 @@ StreamLogicalLog(void)
 
 			if (endposReached)
 			{
-				prepareToTerminate(conn, endpos, true, InvalidXLogRecPtr);
+				cur_record_lsn = InvalidXLogRecPtr;
 				time_to_abort = true;
 				break;
 			}
@@ -527,7 +528,6 @@ StreamLogicalLog(void)
 			 */
 			if (!flushAndSendFeedback(conn, &now))
 				goto error;
-			prepareToTerminate(conn, endpos, false, cur_record_lsn);
 			time_to_abort = true;
 			break;
 		}
@@ -572,12 +572,14 @@ StreamLogicalLog(void)
 			/* endpos was exactly the record we just processed, we're done */
 			if (!flushAndSendFeedback(conn, &now))
 				goto error;
-			prepareToTerminate(conn, endpos, false, cur_record_lsn);
 			time_to_abort = true;
 			break;
 		}
 	}
 
+	if (time_to_abort)
+		prepareToTerminate(conn, endpos, false, cur_record_lsn);
+
 	res = PQgetResult(conn);
 	if (PQresultStatus(res) == PGRES_COPY_OUT)
 	{
@@ -657,6 +659,7 @@ static void
 sigexit_handler(SIGNAL_ARGS)
 {
 	time_to_abort = true;
+	interrupted = true;
 }
 
 /*
@@ -1031,6 +1034,8 @@ prepareToTerminate(PGconn *conn, XLogRecPtr endpos, bool keepalive, XLogRecPtr l
 		if (keepalive)
 			pg_log_info("end position %X/%X reached by keepalive",
 						LSN_FORMAT_ARGS(endpos));
+		else if (interrupted)
+			pg_log_info("interrupted after %X/%X", LSN_FORMAT_ARGS(lsn));
 		else
 			pg_log_info("end position %X/%X reached by WAL record at %X/%X",
 						LSN_FORMAT_ARGS(endpos), LSN_FORMAT_ARGS(lsn));