diff --git a/mailbox-core/build.gradle b/mailbox-core/build.gradle
index a5e3e30187bf05ce818df90d3702bc8e662864e5..d07b539ab5cd2ca7915d16989b5f8019575c9178 100644
--- a/mailbox-core/build.gradle
+++ b/mailbox-core/build.gradle
@@ -27,7 +27,7 @@ dependencies {
     implementation "io.ktor:ktor-jackson:$ktor_version"
     api "org.slf4j:slf4j-api:1.7.32"
 
-    implementation 'com.h2database:h2:1.4.200'
+    implementation 'com.h2database:h2:2.0.202'
 
     // Base 32
     implementation 'dev.keiji.rfc4648:rfc4648:1.0.0'
diff --git a/mailbox-core/src/main/java/org/briarproject/mailbox/core/db/JdbcDatabase.kt b/mailbox-core/src/main/java/org/briarproject/mailbox/core/db/JdbcDatabase.kt
index e7c7ec23dc09f7ab4fdd209b0803665eae8df41e..86d62e334fd73338f1080cbeb3864ead5bb0a947 100644
--- a/mailbox-core/src/main/java/org/briarproject/mailbox/core/db/JdbcDatabase.kt
+++ b/mailbox-core/src/main/java/org/briarproject/mailbox/core/db/JdbcDatabase.kt
@@ -37,7 +37,7 @@ abstract class JdbcDatabase(private val dbTypes: DatabaseTypes, private val cloc
                     CREATE TABLE settings
                            (namespace _STRING NOT NULL,
                            settingKey _STRING NOT NULL,
-                           value _STRING NOT NULL,
+                           settingsValue _STRING NOT NULL,
                            PRIMARY KEY (namespace, settingKey))
         """.trimIndent()
 
@@ -406,7 +406,7 @@ abstract class JdbcDatabase(private val dbTypes: DatabaseTypes, private val cloc
         var rs: ResultSet? = null
         return try {
             val sql = """
-                SELECT settingKey, value FROM settings
+                SELECT settingKey, settingsValue FROM settings
                        WHERE namespace = ?
             """.trimIndent()
 
@@ -437,7 +437,7 @@ abstract class JdbcDatabase(private val dbTypes: DatabaseTypes, private val cloc
         try {
             // Update any settings that already exist
             var sql = """
-                UPDATE settings SET value = ?
+                UPDATE settings SET settingsValue = ?
                        WHERE namespace = ? AND settingKey = ?
             """.trimIndent()
 
@@ -456,7 +456,7 @@ abstract class JdbcDatabase(private val dbTypes: DatabaseTypes, private val cloc
             }
             // Insert any settings that don't already exist
             sql = """
-                INSERT INTO settings (namespace, settingKey, value)
+                INSERT INTO settings (namespace, settingKey, settingsValue)
                             VALUES (?, ?, ?)
             """.trimIndent()