diff --git a/src/backend/access/heap/pruneheap.c b/src/backend/access/heap/pruneheap.c
index fdddd23035b..a5968cdf331 100644
--- a/src/backend/access/heap/pruneheap.c
+++ b/src/backend/access/heap/pruneheap.c
@@ -1302,7 +1303,7 @@ heap_page_prune_and_freeze(PruneFreezeParams *params,
 									  do_set_vm ? prstate.vmbuffer : InvalidBuffer,
 									  do_set_vm ? prstate.new_vmbits : 0,
 									  conflict_xid,
-									  true, /* cleanup lock */
+									  do_prune, /* cleanup lock needed only when modifying line pointers */
 									  params->reason,
 									  prstate.frozen, prstate.nfrozen,
 									  prstate.redirected, prstate.nredirected,
diff --git a/src/backend/access/rmgrdesc/heapdesc.c b/src/backend/access/rmgrdesc/heapdesc.c
index 75ae6f9d375..bbc914443b9 100644
--- a/src/backend/access/rmgrdesc/heapdesc.c
+++ b/src/backend/access/rmgrdesc/heapdesc.c
@@ -287,6 +287,9 @@ heap2_desc(StringInfo buf, XLogReaderState *record)
 		appendStringInfo(buf, ", isCatalogRel: %c",
 						 xlrec->flags & XLHP_IS_CATALOG_REL ? 'T' : 'F');
 
+		appendStringInfo(buf, ", cleanupLock: %c",
+						 xlrec->flags & XLHP_CLEANUP_LOCK ? 'T' : 'F');
+
 		if (xlrec->flags & XLHP_VM_ALL_VISIBLE)
 		{
 			uint8		vmflags = VISIBILITYMAP_ALL_VISIBLE;