diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/backup/BackupManager.java b/service/src/main/java/org/whispersystems/textsecuregcm/backup/BackupManager.java
index 924bc831c..2e73f1427 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/backup/BackupManager.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/backup/BackupManager.java
@@ -198,13 +198,13 @@ public class BackupManager {
           return this.remoteStorageManager.calculateBytesUsed(mediaPrefix)
               .thenCompose(usage -> backupsDb
                   .setMediaUsage(backupUser, usage)
-                  .thenApply(ignored -> usage.bytesUsed()))
+                  .thenApply(ignored -> usage))
               .whenComplete((newUsage, throwable) -> {
                 boolean usageChanged = throwable == null && !newUsage.equals(info.usageInfo());
                 Metrics.counter(USAGE_RECALCULATION_COUNTER_NAME, "usageChanged", String.valueOf(usageChanged))
                     .increment();
               })
-              .thenApply(usedSpace -> MAX_TOTAL_BACKUP_MEDIA_BYTES - usedSpace >= mediaLength);
+              .thenApply(newUsage -> MAX_TOTAL_BACKUP_MEDIA_BYTES - newUsage.bytesUsed() >= mediaLength);
         });
   }
 
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/ArchiveController.java b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/ArchiveController.java
index 33dc0120b..b5522c6b1 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/ArchiveController.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/ArchiveController.java
@@ -234,9 +234,9 @@ public class ArchiveController {
       int cdn,
 
       @Schema(description = """
-      If present, the directory of your backup data on the cdn. The message backup can be found at /backupDir/backupName
-      and stored media can be found at /backupDir/media/mediaId.
-      """)
+          If present, the directory of your backup data on the cdn. The message backup can be found at /backupDir/backupName
+          and stored media can be found at /backupDir/media/mediaId.
+          """)
       String backupDir,
 
       @Schema(description = "If present, the name of the most recent message backup on the cdn. The backup is at /backupDir/backupName")
@@ -642,6 +642,7 @@ public class ArchiveController {
       String cursor) {}
 
   @GET
+  @Consumes(MediaType.APPLICATION_JSON)
   @Produces(MediaType.APPLICATION_JSON)
   @Path("/media")
   @Operation(summary = "List media objects",