Don't check for team until the payload is being created#27