diff --git a/src/backend/distributed/metadata/distobject.c b/src/backend/distributed/metadata/distobject.c
index 94c12d47f..9c5b6bf61 100644
--- a/src/backend/distributed/metadata/distobject.c
+++ b/src/backend/distributed/metadata/distobject.c
@@ -386,7 +386,10 @@ UnmarkNodeWideObjectsDistributed(Node *node)
 		Oid dbOid = get_database_oid(dbName, stmt->missing_ok);
 		ObjectAddress *dbObjectAddress = palloc0(sizeof(ObjectAddress));
 		ObjectAddressSet(*dbObjectAddress, DatabaseRelationId, dbOid);
-		UnmarkObjectDistributed(dbObjectAddress);
+		if(IsAnyObjectDistributed(list_make1(dbObjectAddress)))
+		{
+			UnmarkObjectDistributed(dbObjectAddress);
+		}
 	}
 }