diff --git a/src/backend/distributed/deparser/citus_deparseutils.c b/src/backend/distributed/deparser/citus_deparseutils.c
index 3f83f57fd..c0de4ae7c 100644
--- a/src/backend/distributed/deparser/citus_deparseutils.c
+++ b/src/backend/distributed/deparser/citus_deparseutils.c
@@ -70,15 +70,6 @@ DefElemOptionToStatement(StringInfo buf, DefElem *option,
 					break;
 				}
 
-			#if PG_VERSION_NUM >= PG_VERSION_15
-				case OPTION_FORMAT_OBJECT_ID:
-				{
-					Oid value = defGetObjectId(option);
-					appendStringInfo(buf, optionFormats[i].format, value);
-					break;
-				}
-
-			#endif
 				case OPTION_FORMAT_LITERAL_CSTR:
 				{
 					char *value = defGetString(option);
diff --git a/src/backend/distributed/deparser/deparse_database_stmts.c b/src/backend/distributed/deparser/deparse_database_stmts.c
index 6267baef5..e8f8ad4d7 100644
--- a/src/backend/distributed/deparser/deparse_database_stmts.c
+++ b/src/backend/distributed/deparser/deparse_database_stmts.c
@@ -323,11 +323,6 @@ DeparseCreateDatabaseStmt(Node *node)
 static void
 AppendCreateDatabaseStmt(StringInfo buf, CreatedbStmt *stmt)
 {
-	/*
-	 * Make sure that we don't try to deparse something that this
-	 * function doesn't expect.
-	 */
-	EnsureSupportedCreateDatabaseCommand(stmt);
 
 	appendStringInfo(buf,
 					 "CREATE DATABASE %s",
diff --git a/src/test/regress/expected/create_drop_database_propagation.out b/src/test/regress/expected/create_drop_database_propagation.out
index 066ec6889..eb637f8c2 100644
--- a/src/test/regress/expected/create_drop_database_propagation.out
+++ b/src/test/regress/expected/create_drop_database_propagation.out
@@ -932,11 +932,6 @@ SELECT * FROM public.check_database_on_all_nodes('test_db') ORDER BY node_type;
 REVOKE CONNECT ON DATABASE test_db FROM propagated_role;
 DROP DATABASE test_db;
 DROP ROLE propagated_role, non_propagated_role;
---test that create database with oid option failed when citus.enable_create_database_propagation is on
-set citus.enable_create_database_propagation TO on;
-CREATE DATABASE db_oid_test WITH OID 123;
-ERROR:  CREATE DATABASE option "oid" is not supported
-set citus.enable_create_database_propagation TO off;
 --clean up resources created by this test
 -- DROP TABLESPACE is not supported, so we need to drop it manually.
 SELECT result FROM run_command_on_all_nodes(
diff --git a/src/test/regress/sql/create_drop_database_propagation.sql b/src/test/regress/sql/create_drop_database_propagation.sql
index 97bec905a..c71841eee 100644
--- a/src/test/regress/sql/create_drop_database_propagation.sql
+++ b/src/test/regress/sql/create_drop_database_propagation.sql
@@ -536,13 +536,6 @@ REVOKE CONNECT ON DATABASE test_db FROM propagated_role;
 DROP DATABASE test_db;
 DROP ROLE propagated_role, non_propagated_role;
 
---test that create database with oid option failed when citus.enable_create_database_propagation is on
-set citus.enable_create_database_propagation TO on;
-CREATE DATABASE db_oid_test WITH OID 123;
-
-set citus.enable_create_database_propagation TO off;
-
-
 
 --clean up resources created by this test