diff --git a/indexing-service/src/main/java/io/druid/indexing/common/task/ArchiveTask.java b/indexing-service/src/main/java/io/druid/indexing/common/task/ArchiveTask.java
index c2cbf9f4103..d7c1960e4a6 100644
--- a/indexing-service/src/main/java/io/druid/indexing/common/task/ArchiveTask.java
+++ b/indexing-service/src/main/java/io/druid/indexing/common/task/ArchiveTask.java
@@ -89,20 +89,12 @@ public class ArchiveTask extends AbstractFixedIntervalTask
       log.info("OK to archive segment: %s", unusedSegment.getIdentifier());
     }
 
-    List<DataSegment> archivedSegments = Lists.newLinkedList();
-
     // Move segments
     for (DataSegment segment : unusedSegments) {
-      archivedSegments.add(toolbox.getDataSegmentArchiver().archive(segment));
+      final DataSegment archivedSegment = toolbox.getDataSegmentArchiver().archive(segment);
+      toolbox.getTaskActionClient().submit(new SegmentMetadataUpdateAction(ImmutableSet.of(archivedSegment)));
     }
 
-    // Update metadata for moved segments
-    toolbox.getTaskActionClient().submit(
-        new SegmentMetadataUpdateAction(
-            ImmutableSet.copyOf(archivedSegments)
-        )
-    );
-
     return TaskStatus.success(getId());
   }
 }