diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountsDynamoDb.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountsDynamoDb.java
index 739636084..1465aa7cb 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountsDynamoDb.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountsDynamoDb.java
@@ -260,8 +260,13 @@ public class AccountsDynamoDb extends AbstractDynamoDbStore implements AccountSt
 
   public CompletableFuture<Void> migrate(List<Account> accounts, int threads) {
 
-    migrationThreadPool.setCorePoolSize(threads);
-    migrationThreadPool.setMaximumPoolSize(threads);
+    if (threads > migrationThreadPool.getMaximumPoolSize()) {
+      migrationThreadPool.setMaximumPoolSize(threads);
+      migrationThreadPool.setCorePoolSize(threads);
+    } else {
+      migrationThreadPool.setCorePoolSize(threads);
+      migrationThreadPool.setMaximumPoolSize(threads);
+    }
 
     final List<CompletableFuture<?>> futures = accounts.stream()
         .map(this::migrate)