diff --git a/storage/local/persistence.go b/storage/local/persistence.go
index 0c6bb19e37..128544e6a6 100644
--- a/storage/local/persistence.go
+++ b/storage/local/persistence.go
@@ -710,9 +710,10 @@ func (p *diskPersistence) processIndexingQueue() {
 	defer batchTimeout.Stop()
 
 	commitBatch := func() {
-		begin := time.Now()
-		defer p.indexingBatchLatency.Observe(float64(time.Since(begin) / time.Millisecond))
 		p.indexingBatchSizes.Observe(float64(batchSize))
+		defer func(begin time.Time) {
+			p.indexingBatchLatency.Observe(float64(time.Since(begin) / time.Millisecond))
+		}(time.Now())
 
 		if err := p.labelPairToFingerprints.IndexBatch(pairToFPs); err != nil {
 			glog.Error("Error indexing label pair to fingerprints batch: ", err)