diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index ae7a0556ed5..54c3dab7ad9 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -9955,13 +9955,17 @@ CheckPointReplicationState(void)
 /*
  * NEON:  we use logical records to persist information of about slots, origins, relation map...
  * If it is done inside shutdown checkpoint, then Postgres panics: "concurrent write-ahead log activity while database system is shutting down"
- * So it before checkpoint REDO position is determined.
+ * So do it before checkpoint REDO position is determined.
+ * The same is true for CheckPointBuffers which wallog dirty FSM/VM pages.
  */
 static void
 PreCheckPointGuts(int flags)
 {
 	if (flags & CHECKPOINT_IS_SHUTDOWN)
+	{
 		CheckPointReplicationState();
+		CheckPointBuffers(flags);
+	}
 }
 
 /*
@@ -9984,7 +9988,14 @@ CheckPointGuts(XLogRecPtr checkPointRedo, int flags)
 	CheckPointSUBTRANS();
 	CheckPointMultiXact();
 	CheckPointPredicate();
-	CheckPointBuffers(flags);
+	/*
+	 * NEON: Checkpoint buffer will write dirty pages to the disk and Neon SMGR
+	 * wallog FSM/VM pages to persist them at page server.
+	 * Writing to the WAL during shutdown checkpoint cause Postgres panic.
+	 * So do it before in PreCheckPointGuts.
+	 */
+	if (!(flags & CHECKPOINT_IS_SHUTDOWN))
+		CheckPointBuffers(flags);
 
 	/* Perform all queued up fsyncs */
 	TRACE_POSTGRESQL_BUFFER_CHECKPOINT_SYNC_START();