Improve behaviour when multiple databases are disabled