diff --git a/src/backend/distributed/commands/database.c b/src/backend/distributed/commands/database.c
index bc3e197a4..d177cdcea 100644
--- a/src/backend/distributed/commands/database.c
+++ b/src/backend/distributed/commands/database.c
@@ -263,7 +263,7 @@ PreprocessAlterDatabaseSetStmt(Node *node, const char *queryString,
 List *
 PostprocessCreateDatabaseStmt(Node *node, const char *queryString)
 {
-	if (!ShouldPropagate())
+	if (!EnableCreateDatabasePropagation || !ShouldPropagate())
 	{
 		return NIL;
 	}