Need to disable the per site settings due to caching issues.