diff --git a/src/backend/access/transam/clog.c b/src/backend/access/transam/clog.c
index 6f7f6b86eb6..8796477105f 100644
--- a/src/backend/access/transam/clog.c
+++ b/src/backend/access/transam/clog.c
@@ -777,7 +777,17 @@ CLOGShmemBuffers(void)
 {
 	/* auto-tune based on shared buffers */
 	if (transaction_buffers == 0)
-		return SimpleLruAutotuneBuffers(512, 1024);
+	{
+		int			autotune = SimpleLruAutotuneBuffers(512, 1024);
+
+		/*
+		 * Clamp to at least 8 banks (128 slots, 1MB).  A smaller pool
+		 * causes CLOG page re-reads under concurrency.  8 is chosen
+		 * empirically: 4 banks (64 slots) reaches peak throughput, 8
+		 * provides headroom and reduces re-reads ~7x vs 4.
+		 */
+		return Max(autotune, 8 * SLRU_BANK_SIZE);
+	}
 
 	return Min(Max(16, transaction_buffers), CLOG_MAX_ALLOWED_BUFFERS);
 }
diff --git a/src/backend/access/transam/slru.c b/src/backend/access/transam/slru.c
index 885fd068535..dd63e5e6380 100644
--- a/src/backend/access/transam/slru.c
+++ b/src/backend/access/transam/slru.c
@@ -135,16 +135,6 @@ typedef struct SlruWriteAllData
 typedef struct SlruWriteAllData *SlruWriteAll;
 
 
-/*
- * Bank size for the slot array.  Pages are assigned a bank according to their
- * page number, with each bank being this size.  We want a power of 2 so that
- * we can determine the bank number for a page with just bit shifting; we also
- * want to keep the bank size small so that LRU victim search is fast.  16
- * buffers per bank seems a good number.
- */
-#define SLRU_BANK_BITSHIFT		4
-#define SLRU_BANK_SIZE			(1 << SLRU_BANK_BITSHIFT)
-
 /*
  * Macro to get the bank number to which the slot belongs.
  */
diff --git a/src/include/access/slru.h b/src/include/access/slru.h
index b4adb1789c7..0d625369956 100644
--- a/src/include/access/slru.h
+++ b/src/include/access/slru.h
@@ -218,6 +218,16 @@ extern void SimpleLruRequestWithOpts(const SlruOpts *options);
 #define SimpleLruRequest(...)  \
 	SimpleLruRequestWithOpts(&(SlruOpts){__VA_ARGS__})
 
+/*
+ * Bank size for the slot array.  Pages are assigned a bank according to their
+ * page number, with each bank being this size.  We want a power of 2 so that
+ * we can determine the bank number for a page with just bit shifting; we also
+ * want to keep the bank size small so that LRU victim search is fast.  16
+ * buffers per bank seems a good number.
+ */
+#define SLRU_BANK_BITSHIFT		4
+#define SLRU_BANK_SIZE			(1 << SLRU_BANK_BITSHIFT)
+
 extern int	SimpleLruAutotuneBuffers(int divisor, int max);
 extern int	SimpleLruZeroPage(SlruDesc *ctl, int64 pageno);
 extern void SimpleLruZeroAndWritePage(SlruDesc *ctl, int64 pageno);
