diff --git a/src/Module/Admin/DBSync.php b/src/Module/Admin/DBSync.php
index bb1fa9033..3ab9fb799 100644
--- a/src/Module/Admin/DBSync.php
+++ b/src/Module/Admin/DBSync.php
@@ -42,7 +42,7 @@ class DBSync extends BaseAdmin
 		switch ($action) {
 			case 'mark':
 				if ($update) {
-					DI::config()->set('database', 'update_' . $update, 'success');
+					DI::keyValue()->set('database_update_' . $update, 'success');
 					$curr = DI::config()->get('system', 'build');
 					if (intval($curr) == $update) {
 						DI::config()->set('system', 'build', intval($curr) + 1);
diff --git a/update.php b/update.php
index 9aaf95193..2235b0451 100644
--- a/update.php
+++ b/update.php
@@ -1150,7 +1150,8 @@ function update_1505()
 {
 	$conditions = [
 		"((`cat`  = ?) AND ((`k` LIKE ?) OR (`k` = ?) OR (`k` LIKE ?) OR (`k` = ?))) OR " .
-		"((`cat` != ?) AND  (`k` LIKE ?))",
+		"((`cat` != ?) AND  (`k` LIKE ?)) OR " .
+		"((`cat`  = ?) AND  (`k` LIKE ?))",
 		"system",
 		"post_update_%",
 		"worker_last_cleaned",
@@ -1158,6 +1159,8 @@ function update_1505()
 		"worker_daemon_mode",
 		"system",
 		"last_%",
+		"database",
+		"update_%",
 	];
 
 	$postUpdateEntries = DBA::selectToArray('config', ['cat', 'k', 'v'], $conditions);