diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/Accounts.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/Accounts.java
index 9df40a1ba..43c91c370 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/Accounts.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/Accounts.java
@@ -1253,11 +1253,7 @@ public class Accounts {
               .totalSegments(segments)
               .build());
 
-          // Subscribe to the publisher of responses (i.e. `scanPublisher`) rather than the publisher of items
-          // (i.e. `scanPublisher.items()`) to work around https://github.com/aws/aws-sdk-java-v2/issues/6411
-          return Flux.from(scanPublisher)
-              .flatMap(scanResponse -> Flux.fromIterable(scanResponse.items()))
-              .map(Accounts::fromItem);
+          return Flux.from(scanPublisher.items()).map(Accounts::fromItem);
         })
         .sequential();
   }