diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index f752b693d035eb5184f7afa7bf907fceb7bbff26..4db0da1ecfd5a44ad177c9daacdb65e379f7f55a 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -1476,7 +1476,7 @@ class installer_base {
 		if ( substr($mail_config['dkim_path'], strlen($mail_config['dkim_path'])-1) == '/' ) {
 			$mail_config['dkim_path'] = substr($mail_config['dkim_path'], 0, strlen($mail_config['dkim_path'])-1);
 		}
-		$dkim_domains = $this->db->queryAllRecords('SELECT `dkim_selector`, `domain` FROM `mail_domain` WHERE `dkim` = ? ORDER BY `domain` ASC', 'y');
+		$dkim_domains = $this->db->queryAllRecords('SELECT `dkim_selector`, `domain` FROM ?? WHERE `dkim` = ? ORDER BY `domain` ASC', $conf['mysql']['database'] . '.mail_domain', 'y');
 		$fpp = fopen('/etc/rspamd/local.d/dkim_domains.map', 'w');
 		$fps = fopen('/etc/rspamd/local.d/dkim_selectors.map', 'w');
 		foreach($dkim_domains as $dkim_domain) {
diff --git a/install/update.php b/install/update.php
index b700219f2e9d5b5b5e0bf9629556fec32be75013..42ddd625f5aca69cebcf2b8d1c8064d1b1735ba2 100644
--- a/install/update.php
+++ b/install/update.php
@@ -253,7 +253,6 @@ prepareDBDump();
 
 //* initialize the database
 $inst->db = new db();
-$inst->db->setDBName($conf['mysql']['database']);
 
 //* initialize the master DB, if we have a multiserver setup
 if($conf['mysql']['master_slave_setup'] == 'y') {