diff --git a/app/sql.js b/app/sql.js
index ef1aec203..7b4be3393 100644
--- a/app/sql.js
+++ b/app/sql.js
@@ -2750,22 +2750,11 @@ async function removeAll() {
   db.serialize(() => {
     promise = Promise.all([
       db.run('BEGIN TRANSACTION;'),
+      ...getRemoveConfigurationPromises(),
       db.run('DELETE FROM conversations;'),
-      db.run('DELETE FROM identityKeys;'),
-      db.run('DELETE FROM items;'),
       db.run('DELETE FROM messages;'),
-      db.run('DELETE FROM preKeys;'),
-      db.run('DELETE FROM sessions;'),
-      db.run('DELETE FROM signedPreKeys;'),
-      db.run('DELETE FROM unprocessed;'),
-      db.run('DELETE FROM contactPreKeys;'),
-      db.run('DELETE FROM contactSignedPreKeys;'),
       db.run('DELETE FROM attachment_downloads;'),
       db.run('DELETE FROM messages_fts;'),
-      db.run('DELETE FROM servers;'),
-      db.run('DELETE FROM lastHashes;'),
-      db.run('DELETE FROM seenMessages;'),
-      db.run('DELETE FROM sessions;'),
       db.run('COMMIT TRANSACTION;'),
     ]);
   });
@@ -2773,6 +2762,22 @@ async function removeAll() {
   await promise;
 }
 
+function getRemoveConfigurationPromises() {
+  return [
+    db.run('DELETE FROM identityKeys;'),
+    db.run('DELETE FROM items;'),
+    db.run('DELETE FROM preKeys;'),
+    db.run('DELETE FROM sessions;'),
+    db.run('DELETE FROM signedPreKeys;'),
+    db.run('DELETE FROM unprocessed;'),
+    db.run('DELETE FROM contactPreKeys;'),
+    db.run('DELETE FROM contactSignedPreKeys;'),
+    db.run('DELETE FROM servers;'),
+    db.run('DELETE FROM lastHashes;'),
+    db.run('DELETE FROM seenMessages;'),
+  ];
+}
+
 // Anything that isn't user-visible data
 async function removeAllConfiguration() {
   let promise;
@@ -2780,15 +2785,7 @@ async function removeAllConfiguration() {
   db.serialize(() => {
     promise = Promise.all([
       db.run('BEGIN TRANSACTION;'),
-      db.run('DELETE FROM identityKeys;'),
-      db.run('DELETE FROM items;'),
-      db.run('DELETE FROM preKeys;'),
-      db.run('DELETE FROM sessions;'),
-      db.run('DELETE FROM signedPreKeys;'),
-      db.run('DELETE FROM unprocessed;'),
-      db.run('DELETE FROM contactPreKeys;'),
-      db.run('DELETE FROM contactSignedPreKeys;'),
-      db.run('DELETE FROM servers;'),
+      ...getRemoveConfigurationPromises(),
       db.run('COMMIT TRANSACTION;'),
     ]);
   });