diff --git a/pgxn/neon/walproposer_pg.c b/pgxn/neon/walproposer_pg.c
index 75f33515ba..b3910aa9e7 100644
--- a/pgxn/neon/walproposer_pg.c
+++ b/pgxn/neon/walproposer_pg.c
@@ -35,6 +35,7 @@
 #include "storage/proc.h"
 #include "storage/ipc.h"
 #include "storage/lwlock.h"
+#include "storage/pg_shmem.h"
 #include "storage/shmem.h"
 #include "storage/spin.h"
 #include "tcop/tcopprot.h"
@@ -306,7 +307,7 @@ assign_neon_safekeepers(const char *newval, void *extra)
 	char	   *newval_copy;
 	char	   *oldval;
 
-	if (newval && *newval != '\0' && walprop_shared && RecoveryInProgress())
+	if (newval && *newval != '\0' && UsedShmemSegAddr && walprop_shared && RecoveryInProgress())
 		walprop_shared->replica_promote = true;
 
 	if (!am_walproposer)
diff --git a/vendor/postgres-v14 b/vendor/postgres-v14
index 78c1568afb..9392ac02ce 160000
--- a/vendor/postgres-v14
+++ b/vendor/postgres-v14
@@ -1 +1 @@
-Subproject commit 78c1568afbbacc1604ac5e5cc2ebc9b7ed0cfde9
+Subproject commit 9392ac02ce8b96a4a4eb766552c8aa85efc40939
diff --git a/vendor/postgres-v15 b/vendor/postgres-v15
index f2cd317375..46398092e0 160000
--- a/vendor/postgres-v15
+++ b/vendor/postgres-v15
@@ -1 +1 @@
-Subproject commit f2cd31737536218c39c66f920ff62f72c51d0d61
+Subproject commit 46398092e0817fbb1d846714103ca2c6c0264158
diff --git a/vendor/postgres-v16 b/vendor/postgres-v16
index 3d6896afaa..3da009ed1a 160000
--- a/vendor/postgres-v16
+++ b/vendor/postgres-v16
@@ -1 +1 @@
-Subproject commit 3d6896afaa89c05b693e9a29275001b801b8b479
+Subproject commit 3da009ed1a80fe57c5feb521e41a5d017affeb78
diff --git a/vendor/postgres-v17 b/vendor/postgres-v17
index 28b88cfedf..69613e831a 160000
--- a/vendor/postgres-v17
+++ b/vendor/postgres-v17
@@ -1 +1 @@
-Subproject commit 28b88cfedf9a6028cf7ea32a80ea15a9bf971803
+Subproject commit 69613e831a6cf8b2d9e547ce39a583fa1b272994
diff --git a/vendor/revisions.json b/vendor/revisions.json
index 6ad518db0a..43223ecd27 100644
--- a/vendor/revisions.json
+++ b/vendor/revisions.json
@@ -1,18 +1,18 @@
 {
   "v17": [
     "17.5",
-    "28b88cfedf9a6028cf7ea32a80ea15a9bf971803"
+    "69613e831a6cf8b2d9e547ce39a583fa1b272994"
   ],
   "v16": [
     "16.9",
-    "3d6896afaa89c05b693e9a29275001b801b8b479"
+    "3da009ed1a80fe57c5feb521e41a5d017affeb78"
   ],
   "v15": [
     "15.13",
-    "f2cd31737536218c39c66f920ff62f72c51d0d61"
+    "46398092e0817fbb1d846714103ca2c6c0264158"
   ],
   "v14": [
     "14.18",
-    "78c1568afbbacc1604ac5e5cc2ebc9b7ed0cfde9"
+    "9392ac02ce8b96a4a4eb766552c8aa85efc40939"
   ]
 }