Fix for very new and empty CMS