diff --git a/app/sql.js b/app/sql.js
index 82b70e6cc..ef1aec203 100644
--- a/app/sql.js
+++ b/app/sql.js
@@ -2762,6 +2762,10 @@ async function removeAll() {
       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;'),
     ]);
   });
@@ -2784,6 +2788,7 @@ async function removeAllConfiguration() {
       db.run('DELETE FROM unprocessed;'),
       db.run('DELETE FROM contactPreKeys;'),
       db.run('DELETE FROM contactSignedPreKeys;'),
+      db.run('DELETE FROM servers;'),
       db.run('COMMIT TRANSACTION;'),
     ]);
   });
diff --git a/ts/components/session/RegistrationTabs.tsx b/ts/components/session/RegistrationTabs.tsx
index 23840df9a..f4e9859c0 100644
--- a/ts/components/session/RegistrationTabs.tsx
+++ b/ts/components/session/RegistrationTabs.tsx
@@ -713,13 +713,8 @@ export class RegistrationTabs extends React.Component<{}, State> {
   }
 
   private async resetRegistration() {
-    await window.Signal.Data.removeAllIdentityKeys();
-    await window.Signal.Data.removeAllPrivateConversations();
-    window.Whisper.Registration.remove();
-    // Do not remove all items since they are only set
-    // at startup.
-    window.textsecure.storage.remove('identityKey');
-    window.textsecure.storage.remove('secondaryDeviceStatus');
+    await window.Signal.Data.removeAll();
+    await window.storage.fetch();
     window.ConversationController.reset();
     await window.ConversationController.load();
     window.Whisper.RotateSignedPreKeyListener.stop(window.Whisper.events);