diff --git a/pgxn/neon/communicator.c b/pgxn/neon/communicator.c
index c8c7b5bf07..8e19f51758 100644
--- a/pgxn/neon/communicator.c
+++ b/pgxn/neon/communicator.c
@@ -1922,11 +1922,8 @@ nm_to_string(NeonMessage *msg)
 static void
 reset_min_request_lsn(int code, Datum arg)
 {
-#if PG_MAJORVERSION_NUM < 15
-	if (!MyProc)
-		return;
-#endif
-	MIN_BACKEND_REQUEST_LSN = InvalidXLogRecPtr;
+	if (MyProcNumber != -1)
+		MIN_BACKEND_REQUEST_LSN = InvalidXLogRecPtr;
 }
 
 /*
diff --git a/pgxn/neon/neon_perf_counters.c b/pgxn/neon/neon_perf_counters.c
index e8ce83e7a7..ae2514787a 100644
--- a/pgxn/neon/neon_perf_counters.c
+++ b/pgxn/neon/neon_perf_counters.c
@@ -22,6 +22,9 @@
 #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)