diff --git a/src/backend/distributed/deparser/deparse_database_stmts.c b/src/backend/distributed/deparser/deparse_database_stmts.c
index 30ac3f32c..66df5361e 100644
--- a/src/backend/distributed/deparser/deparse_database_stmts.c
+++ b/src/backend/distributed/deparser/deparse_database_stmts.c
@@ -277,6 +277,11 @@ AppendCreateDatabaseStmt(StringInfo buf, CreatedbStmt *stmt)
 	/*
 	 * Make sure that we don't try to deparse something that this
 	 * function doesn't expect.
+	 *
+	 * This is also useful to throw an error for unsupported CREATE
+	 * DATABASE options when the command is issued from non-main dbs
+	 * because we use the same function to deparse CREATE DATABASE
+	 * commands there too.
 	 */
 	EnsureSupportedCreateDatabaseCommand(stmt);
 
diff --git a/src/test/regress/expected/create_drop_database_propagation_pg15.out b/src/test/regress/expected/create_drop_database_propagation_pg15.out
index 9a501558a..7e76d87f3 100644
--- a/src/test/regress/expected/create_drop_database_propagation_pg15.out
+++ b/src/test/regress/expected/create_drop_database_propagation_pg15.out
@@ -78,5 +78,11 @@ SELECT * FROM public.check_database_on_all_nodes('test_locale_provider') ORDER B
  worker node (remote) | {"database_properties": {"datacl": null, "datname": "test_locale_provider", "datctype": "C", "encoding": "UTF8", "datcollate": "C", "tablespace": "pg_default", "daticurules": null, "datallowconn": true, "datconnlimit": -1, "daticulocale": null, "datistemplate": false, "database_owner": "postgres", "datcollversion": null, "datlocprovider": "c"}, "pg_dist_object_record_for_db_exists": true, "stale_pg_dist_object_record_for_a_db_exists": false}
 (3 rows)
 
+\c test_locale_provider - - :worker_2_port
+set citus.enable_create_database_propagation to on;
+create database unsupported_option_from_non_main_db with oid = 12345;
+ERROR:  CREATE DATABASE option "oid" is not supported
+\c regression - - :master_port
+set citus.enable_create_database_propagation to on;
 drop database test_locale_provider;
 \c - - - :master_port
diff --git a/src/test/regress/sql/create_drop_database_propagation_pg15.sql b/src/test/regress/sql/create_drop_database_propagation_pg15.sql
index 40d1b9e09..4e006c54f 100644
--- a/src/test/regress/sql/create_drop_database_propagation_pg15.sql
+++ b/src/test/regress/sql/create_drop_database_propagation_pg15.sql
@@ -60,6 +60,14 @@ CREATE DATABASE test_locale_provider
 
 SELECT * FROM public.check_database_on_all_nodes('test_locale_provider') ORDER BY node_type;
 
+\c test_locale_provider - - :worker_2_port
+
+set citus.enable_create_database_propagation to on;
+create database unsupported_option_from_non_main_db with oid = 12345;
+
+\c regression - - :master_port
+
+set citus.enable_create_database_propagation to on;
 drop database test_locale_provider;
 
 \c - - - :master_port