diff --git a/js/modules/backup.js b/js/modules/backup.js
index 0c5a46d5f..b45e0c5e8 100644
--- a/js/modules/backup.js
+++ b/js/modules/backup.js
@@ -983,8 +983,6 @@ async function loadAttachments(dir, getName, options) {
   );
 
   // TODO: Handle video screenshots, and image/video thumbnails
-
-  window.log.info('loadAttachments', { message });
 }
 
 function saveMessage(db, message) {
@@ -1008,7 +1006,9 @@ async function saveAllMessages(db, rawMessages) {
     for (let index = 0, max = messages.length; index < max; index += 1) {
       // Yes, we really want to do these in order
       // eslint-disable-next-line no-await-in-loop
-      await window.Signal.Data.saveMessage(messages[index]);
+      await window.Signal.Data.saveMessage(messages[index], {
+        forceSave: true,
+      });
     }
 
     window.log.info(
diff --git a/js/views/import_view.js b/js/views/import_view.js
index 459b6be2d..712a1d20f 100644
--- a/js/views/import_view.js
+++ b/js/views/import_view.js
@@ -38,7 +38,10 @@
       return storage.put(IMPORT_LOCATION, location);
     },
     reset() {
-      return Whisper.Database.clear();
+      return Promise.all([
+        Whisper.Database.clear(),
+        Window.Signal.Data.removeAll(),
+      ]);
     },
   };