diff --git a/Signal/src/util/Backup/OWSBackupImportJob.m b/Signal/src/util/Backup/OWSBackupImportJob.m
index bed66c3a7..131a735df 100644
--- a/Signal/src/util/Backup/OWSBackupImportJob.m
+++ b/Signal/src/util/Backup/OWSBackupImportJob.m
@@ -187,8 +187,9 @@ NSString *const kOWSBackup_ImportDatabaseKeySpec = @"kOWSBackup_ImportDatabaseKe
             [OWSBackup.sharedManager setIsBackupEnabled:YES];
         })
         .thenInBackground(^{
-            [[self.tsAccountManager updateAccountAttributes] retainUntilComplete];
-
+            return [self.tsAccountManager updateAccountAttributes];
+        })
+        .thenInBackground(^{
             [self succeed];
         });
 }