diff --git a/indexing-service/src/main/java/io/druid/indexing/common/actions/SegmentTransactionalInsertAction.java b/indexing-service/src/main/java/io/druid/indexing/common/actions/SegmentTransactionalInsertAction.java
index 78f84f89e053..27b4df9cbb01 100644
--- a/indexing-service/src/main/java/io/druid/indexing/common/actions/SegmentTransactionalInsertAction.java
+++ b/indexing-service/src/main/java/io/druid/indexing/common/actions/SegmentTransactionalInsertAction.java
@@ -125,21 +125,20 @@ public SegmentPublishResult perform(Task task, TaskActionToolbox toolbox)
       throw new RuntimeException(e);
     }
 
+    // Emit metrics
+    final ServiceMetricEvent.Builder metricBuilder = new ServiceMetricEvent.Builder();
+    IndexTaskUtils.setTaskDimensions(metricBuilder, task);
+
     if (retVal.isSuccess()) {
-      // Emit metrics
-      final ServiceMetricEvent.Builder metricBuilder = new ServiceMetricEvent.Builder();
-      IndexTaskUtils.setTaskDimensions(metricBuilder, task);
-
-      if (retVal.isSuccess()) {
-        toolbox.getEmitter().emit(metricBuilder.build("segment/txn/success", 1));
-      } else {
-        toolbox.getEmitter().emit(metricBuilder.build("segment/txn/failure", 1));
-      }
-
-      for (DataSegment segment : retVal.getSegments()) {
-        metricBuilder.setDimension(DruidMetrics.INTERVAL, segment.getInterval().toString());
-        toolbox.getEmitter().emit(metricBuilder.build("segment/added/bytes", segment.getSize()));
-      }
+      toolbox.getEmitter().emit(metricBuilder.build("segment/txn/success", 1));
+    } else {
+      toolbox.getEmitter().emit(metricBuilder.build("segment/txn/failure", 1));
+    }
+
+    // getSegments() should return an empty set if announceHistoricalSegments() failed
+    for (DataSegment segment : retVal.getSegments()) {
+      metricBuilder.setDimension(DruidMetrics.INTERVAL, segment.getInterval().toString());
+      toolbox.getEmitter().emit(metricBuilder.build("segment/added/bytes", segment.getSize()));
     }
 
     return retVal;