diff --git a/native/backup/backup-handler-context-provider.js b/native/backup/backup-handler-context-provider.js
--- a/native/backup/backup-handler-context-provider.js
+++ b/native/backup/backup-handler-context-provider.js
@@ -253,9 +253,11 @@
         usingRestoreFlow && !currentDeviceList.curPrimarySignature;
       const shouldUploadUserKeys = isPrimary && !latestBackupInfo;
 
-      // App has UserKeys backup, but without UserData and this is first
-      // ever upload.
-      const firstUserDataUpload = restoreBackupState.status === 'no_backup';
+      // App has UserKeys backup, but without UserData, and this is the first
+      // ever compaction upload (after restore or registration).
+      const firstUserDataUpload =
+        restoreBackupState.status === 'no_backup' ||
+        restoreBackupState.status === 'user_data_restore_completed';
 
       // When previous upload failed, device should restart it.
       const userDataUploadFailed =