diff --git a/storage/metric/tiered.go b/storage/metric/tiered.go
index b69f9edf96..9439b09b6b 100644
--- a/storage/metric/tiered.go
+++ b/storage/metric/tiered.go
@@ -422,6 +422,8 @@ func (t *TieredStorage) renderView(viewJob viewJob) {
 	extractionTimer := viewJob.stats.GetTimer(stats.ViewDataExtractionTime).Start()
 	for viewJob.builder.HasOp() {
 		op := viewJob.builder.PopOp()
+		defer giveBackOp(op)
+
 		fp := op.Fingerprint()
 		old, err := t.seriesTooOld(fp, op.CurrentTime())
 		if err != nil {
@@ -525,7 +527,6 @@ func (t *TieredStorage) renderView(viewJob viewJob) {
 				view.appendSamples(fp, op.ExtractSamples(Values(currentChunk)))
 			}
 		}
-		giveBackOp(op)
 	}
 	extractionTimer.Stop()