diff --git a/server/lib/classes/aps_installer.inc.php b/server/lib/classes/aps_installer.inc.php
index e50c601cecd7d6988c67a5d1667ccc48f4eb257b..7093b1657e9027a2ff202105cba2f76685937228 100644
--- a/server/lib/classes/aps_installer.inc.php
+++ b/server/lib/classes/aps_installer.inc.php
@@ -693,7 +693,7 @@ class ApsInstaller extends ApsBase
 		{
 			$app->db->query('DELETE FROM aps_instances WHERE id = ?', $task['instance_id']);
 			$app->db->query('DELETE FROM aps_instances_settings WHERE instance_id = ?', $task['instance_id']);
-			if ($app->dbmaster != $app->db) {
+			if (!$app->running_on_master()) {
 				$app->dbmaster->query('DELETE FROM aps_instances WHERE id = ?', $task['instance_id']);
 				$app->dbmaster->query('DELETE FROM aps_instances_settings WHERE instance_id = ?', $task['instance_id']);
 			}
diff --git a/server/plugins-available/powerdns_plugin.inc.php b/server/plugins-available/powerdns_plugin.inc.php
index 1221c3bc5658c44b5222f56a5c4d133de30dbe13..618e00c2da9572017f8928c266246bae678ee76e 100644
--- a/server/plugins-available/powerdns_plugin.inc.php
+++ b/server/plugins-available/powerdns_plugin.inc.php
@@ -649,7 +649,7 @@ class powerdns_plugin {
 		$log[] = sprintf("\r\n%s %s", date('c'), 'Running disable-dnssec command...');
 		exec($cmd_disable_dnssec, $log);
 
-		if ($app->dbmaster !== $app->db) {
+		if (!$app->running_on_master()) {
 			$app->dbmaster->query('UPDATE dns_soa SET dnssec_initialized=? WHERE id=?', 'N', intval($data['new']['id']));
 		}
 		$app->db->query('UPDATE dns_soa SET dnssec_initialized=? WHERE id=?', 'N', intval($data['new']['id']));
@@ -680,7 +680,7 @@ class powerdns_plugin {
 		$dnssec_info = array_merge(array('== Raw log ============================'), $log);
 		$dnssec_info = implode("\r\n", $dnssec_info);
 
-		if ($app->dbmaster !== $app->db) {
+		if (!$app->running_on_master()) {
 			$app->dbmaster->query('UPDATE dns_soa SET dnssec_info=?, dnssec_initialized=? WHERE id=?', $dnssec_info, 'N', intval($data['new']['id']));
 		}
 		$app->db->query('UPDATE dns_soa SET dnssec_info=?, dnssec_initialized=? WHERE id=?', $dnssec_info, 'N', intval($data['new']['id']));