diff --git a/keyserver/storage/sqlite3/device_keys_table.go b/keyserver/storage/sqlite3/device_keys_table.go
index d77481f5e..93b8ecd82 100644
--- a/keyserver/storage/sqlite3/device_keys_table.go
+++ b/keyserver/storage/sqlite3/device_keys_table.go
@@ -32,14 +32,14 @@ CREATE TABLE IF NOT EXISTS keyserver_device_keys (
 	ts_added_secs BIGINT NOT NULL,
 	key_json TEXT NOT NULL,
 	-- Clobber based on tuple of user/device.
-    CONSTRAINT keyserver_device_keys_unique UNIQUE (user_id, device_id)
+    UNIQUE (user_id, device_id)
 );
 `
 
 const upsertDeviceKeysSQL = "" +
 	"INSERT INTO keyserver_device_keys (user_id, device_id, ts_added_secs, key_json)" +
 	" VALUES ($1, $2, $3, $4)" +
-	" ON CONFLICT ON CONSTRAINT keyserver_device_keys_unique" +
+	" ON CONFLICT (user_id, device_id)" +
 	" DO UPDATE SET key_json = $4"
 
 const selectDeviceKeysSQL = "" +
diff --git a/keyserver/storage/sqlite3/one_time_keys_table.go b/keyserver/storage/sqlite3/one_time_keys_table.go
index 0f77c8614..86e91268e 100644
--- a/keyserver/storage/sqlite3/one_time_keys_table.go
+++ b/keyserver/storage/sqlite3/one_time_keys_table.go
@@ -36,14 +36,14 @@ CREATE TABLE IF NOT EXISTS keyserver_one_time_keys (
 	ts_added_secs BIGINT NOT NULL,
 	key_json TEXT NOT NULL,
 	-- Clobber based on 4-uple of user/device/key/algorithm.
-    CONSTRAINT keyserver_one_time_keys_unique UNIQUE (user_id, device_id, key_id, algorithm)
+    UNIQUE (user_id, device_id, key_id, algorithm)
 );
 `
 
 const upsertKeysSQL = "" +
 	"INSERT INTO keyserver_one_time_keys (user_id, device_id, key_id, algorithm, ts_added_secs, key_json)" +
 	" VALUES ($1, $2, $3, $4, $5, $6)" +
-	" ON CONFLICT ON CONSTRAINT keyserver_one_time_keys_unique" +
+	" ON CONFLICT (user_id, device_id, key_id, algorithm)" +
 	" DO UPDATE SET key_json = $6"
 
 const selectKeysSQL = "" +