diff --git a/services/commtest/tests/backup_upload_test.rs b/services/commtest/tests/backup_upload_test.rs
--- a/services/commtest/tests/backup_upload_test.rs
+++ b/services/commtest/tests/backup_upload_test.rs
@@ -75,8 +75,11 @@
     .download_backup_data(&backup_descriptor, RequestedData::UserKeys)
     .await;
 
-  assert_reqwest_error(user_data_response, StatusCode::NOT_FOUND);
   assert_reqwest_error(user_keys_response, StatusCode::NOT_FOUND);
+  assert!(matches!(
+    user_data_response,
+    Err(backup_client::Error::NoBackupData)
+  ));
 
   Ok(())
 }
@@ -274,8 +277,11 @@
     .download_backup_data(&removed_backup_descriptor, RequestedData::UserKeys)
     .await;
 
-  assert_reqwest_error(user_data_response, StatusCode::NOT_FOUND);
   assert_reqwest_error(user_keys_response, StatusCode::NOT_FOUND);
+  assert!(matches!(
+    user_data_response,
+    Err(backup_client::Error::NoBackupData)
+  ));
 
   Ok(())
 }
diff --git a/shared/backup_client/src/lib.rs b/shared/backup_client/src/lib.rs
--- a/shared/backup_client/src/lib.rs
+++ b/shared/backup_client/src/lib.rs
@@ -141,7 +141,9 @@
     }
 
     let response = request.send().await?;
-    if response.status() == StatusCode::NOT_FOUND {
+    if response.status() == StatusCode::NOT_FOUND
+      && matches!(requested_data, RequestedData::UserData)
+    {
       return Err(Error::NoBackupData);
     }