diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountDatabaseCrawler.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountDatabaseCrawler.java
index 0822e233c..f643c3648 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountDatabaseCrawler.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountDatabaseCrawler.java
@@ -140,15 +140,12 @@ public class AccountDatabaseCrawler implements Managed, Runnable {
 
   private List<Account> readChunk(Optional<UUID> fromUuid, int chunkSize) {
     try (Timer.Context timer = readChunkTimer.time()) {
-      List<Account> chunkAccounts;
 
       if (fromUuid.isPresent()) {
-        chunkAccounts = accounts.getAllFrom(fromUuid.get(), chunkSize);
-      } else {
-        chunkAccounts = accounts.getAllFrom(chunkSize);
+        return accounts.getAllFrom(fromUuid.get(), chunkSize);
       }
 
-      return chunkAccounts;
+      return accounts.getAllFrom(chunkSize);
     }
   }