[CLC-1890] Race condition with UserData entries

JIRA: https://jira.media.berkeley.edu/jira/browse/CLC-1890