diff --git a/dendrite-config.yaml b/dendrite-config.yaml
index 6d086ed77..533b5c952 100644
--- a/dendrite-config.yaml
+++ b/dendrite-config.yaml
@@ -345,11 +345,6 @@ user_api:
     max_open_conns: 10
     max_idle_conns: 2
     conn_max_lifetime: -1
-  device_database:
-    connection_string: file:userapi_devices.db
-    max_open_conns: 10
-    max_idle_conns: 2
-    conn_max_lifetime: -1
   # The length of time that a token issued for a relying party from 
   # /_matrix/client/r0/user/{userId}/openid/request_token endpoint
   # is considered to be valid in milliseconds. 
diff --git a/sytest-whitelist b/sytest-whitelist
index 7ce3c2484..4a28b06b2 100644
--- a/sytest-whitelist
+++ b/sytest-whitelist
@@ -604,3 +604,5 @@ registration remembers parameters
 registration accepts non-ascii passwords
 registration with inhibit_login inhibits login
 The operation must be consistent through an interactive authentication session
+Multiple calls to /sync should not cause 500 errors
+