diff --git a/pgxn/neon/communicator.c b/pgxn/neon/communicator.c
index b2931ea133..400eaae505 100644
--- a/pgxn/neon/communicator.c
+++ b/pgxn/neon/communicator.c
@@ -1923,7 +1923,7 @@ static void
 reset_min_request_lsn(int code, Datum arg)
 {
 	if (MyProcNumber != -1)
-		neon_per_backend_counters_shared[MyProcNumber].min_request_lsn = InvalidXLogRecPtr;
+		MIN_BACKEND_REQUEST_LSN = InvalidXLogRecPtr;
 }
 
 /*
@@ -1937,7 +1937,7 @@ communicator_init(void)
 	if (MyPState != NULL)
 		return;
 
-	on_shmem_exit(reset_min_request_lsn, 0);
+	before_shmem_exit(reset_min_request_lsn, 0);
 
 	/*
 	 * Sanity check that theperf counters array is sized correctly. We got
diff --git a/pgxn/neon/neon_perf_counters.c b/pgxn/neon/neon_perf_counters.c
index ae2514787a..e8ce83e7a7 100644
--- a/pgxn/neon/neon_perf_counters.c
+++ b/pgxn/neon/neon_perf_counters.c
@@ -22,9 +22,6 @@
 #include "neon_pgversioncompat.h"
 
 neon_per_backend_counters *neon_per_backend_counters_shared;
-#if PG_MAJORVERSION_NUM < 17
-int MyProcNumber = -1;
-#endif
 
 void
 NeonPerfCountersShmemRequest(void)