diff --git a/src/backend/distributed/commands/utility_hook.c b/src/backend/distributed/commands/utility_hook.c
index 782e9bd57..c8343704c 100644
--- a/src/backend/distributed/commands/utility_hook.c
+++ b/src/backend/distributed/commands/utility_hook.c
@@ -1671,14 +1671,12 @@ RunPreprocessMainDBCommand(Node *parsetree, const char *queryString)
 static void
 RunPostprocessMainDBCommand(Node *parsetree)
 {
-	if (!IsStatementSupportedInNonMainDb(parsetree) ||
-		!StatementRequiresMarkDistributedFromNonMainDb(parsetree))
+	if (IsStatementSupportedInNonMainDb(parsetree) &&
+		StatementRequiresMarkDistributedFromNonMainDb(parsetree))
 	{
-		return;
+		ObjectInfo objectInfo = GetObjectInfo(parsetree);
+		MarkObjectDistributedInNonMainDb(parsetree, objectInfo);
 	}
-
-	ObjectInfo objectInfo = GetObjectInfo(parsetree);
-	MarkObjectDistributedInNonMainDb(parsetree, objectInfo);
 }