diff --git a/src/backend/distributed/metadata/node_metadata.c b/src/backend/distributed/metadata/node_metadata.c
index 6c7a98587..2412a88a2 100644
--- a/src/backend/distributed/metadata/node_metadata.c
+++ b/src/backend/distributed/metadata/node_metadata.c
@@ -2930,7 +2930,7 @@ InsertNodeRow(int nodeid, char *nodeName, int32 nodePort, NodeMetadata *nodeMeta
 	TupleDesc tupleDescriptor = RelationGetDescr(pgDistNode);
 	HeapTuple heapTuple = heap_form_tuple(tupleDescriptor, values, isNulls);
 
-	CatalogTupleInsert(pgDistNode, heapTuple);
+	CATALOG_INSERT_WITH_SNAPSHOT(pgDistNode, heapTuple);
 
 	CitusInvalidateRelcacheByRelid(DistNodeRelationId());
 
diff --git a/src/backend/distributed/transaction/transaction_recovery.c b/src/backend/distributed/transaction/transaction_recovery.c
index fb5509def..a4ad3e094 100644
--- a/src/backend/distributed/transaction/transaction_recovery.c
+++ b/src/backend/distributed/transaction/transaction_recovery.c
@@ -106,7 +106,7 @@ LogTransactionRecord(int32 groupId, char *transactionName, FullTransactionId out
 	TupleDesc tupleDescriptor = RelationGetDescr(pgDistTransaction);
 	HeapTuple heapTuple = heap_form_tuple(tupleDescriptor, values, isNulls);
 
-	CatalogTupleInsert(pgDistTransaction, heapTuple);
+	CATALOG_INSERT_WITH_SNAPSHOT(pgDistTransaction, heapTuple);
 
 	CommandCounterIncrement();
 
diff --git a/src/include/pg_version_compat.h b/src/include/pg_version_compat.h
index 385aecd38..997ad4b58 100644
--- a/src/include/pg_version_compat.h
+++ b/src/include/pg_version_compat.h
@@ -13,6 +13,10 @@
 
 #include "pg_version_constants.h"
 
+/* we need these for PG-18’s PushActiveSnapshot/PopActiveSnapshot APIs */
+#include "access/xact.h"
+#include "utils/snapmgr.h"
+
 #if PG_VERSION_NUM >= PG_VERSION_18
 #define create_foreignscan_path_compat(a, b, c, d, e, f, g, h, i, j, k) \
 	create_foreignscan_path( \
@@ -36,6 +40,14 @@
 /* PG-18 unified row-compare operator codes under COMPARE_* */
 #define ROWCOMPARE_NE COMPARE_NE
 
+#define CATALOG_INSERT_WITH_SNAPSHOT(rel, tup) \
+	do { \
+		Snapshot __snap = GetTransactionSnapshot(); \
+		PushActiveSnapshot(__snap); \
+		CatalogTupleInsert((rel), (tup)); \
+		PopActiveSnapshot(); \
+	} while (0)
+
 #elif PG_VERSION_NUM >= PG_VERSION_17
 #define create_foreignscan_path_compat(a, b, c, d, e, f, g, h, i, j, k) \
 	create_foreignscan_path( \
@@ -43,6 +55,10 @@
 		(e), (f), \
 		(g), (h), (i), (j), (k) \
 		)
+
+/* no-op wrapper on older PGs */
+#define CATALOG_INSERT_WITH_SNAPSHOT(rel, tup) \
+	CatalogTupleInsert((rel), (tup))
 #endif
 
 #if PG_VERSION_NUM >= PG_VERSION_17
@@ -453,6 +469,10 @@ getStxstattarget_compat(HeapTuple tup)
 									   k) create_foreignscan_path(a, b, c, d, e, f, g, h, \
 																  i, k)
 
+/* no-op wrapper on older PGs */
+#define CATALOG_INSERT_WITH_SNAPSHOT(rel, tup) \
+	CatalogTupleInsert((rel), (tup))
+
 #define getProcNo_compat(a) (a->pgprocno)
 #define getLxid_compat(a) (a->lxid)