diff --git a/java/com/google/gerrit/server/notedb/rebuild/NoteDbMigrator.java b/java/com/google/gerrit/server/notedb/rebuild/NoteDbMigrator.java
index e064a8c..6a801ec 100644
--- a/java/com/google/gerrit/server/notedb/rebuild/NoteDbMigrator.java
+++ b/java/com/google/gerrit/server/notedb/rebuild/NoteDbMigrator.java
@@ -362,7 +362,8 @@
           primaryStorageMigrator,
           listeners,
           threads > 1
-              ? MoreExecutors.listeningDecorator(workQueue.createQueue(threads, "RebuildChange"))
+              ? MoreExecutors.listeningDecorator(
+                  workQueue.createQueue(threads, "RebuildChange", true))
               : MoreExecutors.newDirectExecutorService(),
           projects,
           changes,