diff --git a/src/backend/columnar/columnar_tableam.c b/src/backend/columnar/columnar_tableam.c
index e64b7613e..9967a265e 100644
--- a/src/backend/columnar/columnar_tableam.c
+++ b/src/backend/columnar/columnar_tableam.c
@@ -881,7 +881,7 @@ columnar_relation_set_new_filenode(Relation rel,
 
 	*freezeXid = RecentXmin;
 	*minmulti = GetOldestMultiXactId();
-	SMgrRelation srel = RelationCreateStorage(*newrnode, persistence);
+	SMgrRelation srel = RelationCreateStorage_compat(*newrnode, persistence, true);
 
 	ColumnarStorageInit(srel, ColumnarMetadataNewStorageId());
 	InitColumnarOptions(rel->rd_id);
diff --git a/src/backend/distributed/test/fake_am.c b/src/backend/distributed/test/fake_am.c
index 63d5a69fe..5a8ede316 100644
--- a/src/backend/distributed/test/fake_am.c
+++ b/src/backend/distributed/test/fake_am.c
@@ -326,7 +326,7 @@ fake_relation_set_new_filenode(Relation rel,
 	 */
 	*minmulti = GetOldestMultiXactId();
 
-	SMgrRelation srel = RelationCreateStorage(*newrnode, persistence);
+	SMgrRelation srel = RelationCreateStorage_compat(*newrnode, persistence, true);
 
 	/*
 	 * If required, set up an init fork for an unlogged table so that it can
diff --git a/src/include/pg_version_compat.h b/src/include/pg_version_compat.h
index e298138d9..dc21acf5f 100644
--- a/src/include/pg_version_compat.h
+++ b/src/include/pg_version_compat.h
@@ -14,11 +14,15 @@
 #include "distributed/pg_version_constants.h"
 
 #if PG_VERSION_NUM >= PG_VERSION_15
+#define ProcessCompletedNotifies()
+#define RelationCreateStorage_compat(a, b, c) RelationCreateStorage(a, b, c)
 #else
 
 #include "storage/smgr.h"
 #include "utils/rel.h"
 
+#define RelationCreateStorage_compat(a, b, c) RelationCreateStorage(a, b)
+
 static inline SMgrRelation
 RelationGetSmgr(Relation rel)
 {