Coworkers are increasingly diverse in their nationality and skill sets. This paper studies the effect of diversity on how workers are organized using data from a field experiment conducted in an environment where diversity is pervasive. Findings show that team organization improves outcomes when workers are from the same country. The opposite is true when workers are nationally diverse. These results are more pronounced for teams of workers with specialized skills. Further investigation of the data suggests that nationally diverse teams have difficulty communicating.