diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index f090baed4f18719e2f808ac7ca5b3a86a6aad175..9208bc21d462d51bd975b560a28e27f467fab39e 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -7119,18 +7119,9 @@ CreateCheckPoint(int flags)
 	 *
 	 * If we are shutting down, or Startup process is completing crash
 	 * recovery we don't need to write running xact data.
-	 *
-	 * Update checkPoint.nextXid since we may have a later value. If we
-	 * do update the value, and we have wrapped, increment epoch also.
 	 */
 	if (!shutdown && XLogStandbyInfoActive())
-	{
-		TransactionId prevXid = checkPoint.nextXid;
-
-		LogStandbySnapshot(&checkPoint.nextXid);
-		if (checkPoint.nextXid < prevXid)
-			checkPoint.nextXidEpoch++;
-	}
+		LogStandbySnapshot();
 
 	START_CRIT_SECTION();
 
diff --git a/src/backend/storage/ipc/standby.c b/src/backend/storage/ipc/standby.c
index 35548d1d1fbf3c9bb7e48d96adf9896e2de9cb4a..9f7cce4063995103c109ae9b039e7aa22acbb841 100644
--- a/src/backend/storage/ipc/standby.c
+++ b/src/backend/storage/ipc/standby.c
@@ -848,7 +848,7 @@ standby_redo(XLogRecPtr lsn, XLogRecord *record)
  * from a time when they were possible.
  */
 void
-LogStandbySnapshot(TransactionId *nextXid)
+LogStandbySnapshot(void)
 {
 	RunningTransactions running;
 	xl_standby_lock *locks;
@@ -877,8 +877,6 @@ LogStandbySnapshot(TransactionId *nextXid)
 	LogCurrentRunningXacts(running);
 	/* GetRunningTransactionData() acquired XidGenLock, we must release it */
 	LWLockRelease(XidGenLock);
-
-	*nextXid = running->nextXid;
 }
 
 /*
diff --git a/src/include/storage/standby.h b/src/include/storage/standby.h
index f917b89f7e120ea8e4d7b10be91af8c78fc7df4f..34558a5a30eca00bb64ced9bd70f6f9318ed08d2 100644
--- a/src/include/storage/standby.h
+++ b/src/include/storage/standby.h
@@ -113,6 +113,6 @@ typedef RunningTransactionsData *RunningTransactions;
 extern void LogAccessExclusiveLock(Oid dbOid, Oid relOid);
 extern void LogAccessExclusiveLockPrepare(void);
 
-extern void LogStandbySnapshot(TransactionId *nextXid);
+extern void LogStandbySnapshot(void);
 
 #endif   /* STANDBY_H */