diff --git a/src/backend/distributed/commands/database.c b/src/backend/distributed/commands/database.c
index d177cdcea..8aee9213f 100644
--- a/src/backend/distributed/commands/database.c
+++ b/src/backend/distributed/commands/database.c
@@ -356,7 +356,7 @@ List *
 PreprocessDropDatabaseStmt(Node *node, const char *queryString,
 						   ProcessUtilityContext processUtilityContext)
 {
-	if (!ShouldPropagate())
+	if (!EnableCreateDatabasePropagation || !ShouldPropagate())
 	{
 		return NIL;
 	}