diff --git a/cmd/metricsfetcher/main.go b/cmd/metricsfetcher/main.go
index b92af10..1df53d9 100644
--- a/cmd/metricsfetcher/main.go
+++ b/cmd/metricsfetcher/main.go
@@ -61,7 +61,7 @@ func init() {
 	}
 
 	// Complete query string.
-	config.BrokerQuery = fmt.Sprintf("%s by {%s}.rollup(avg, %d)", *bq, config.BrokerIDTag, config.Span)
+	config.BrokerQuery = fmt.Sprintf("%s by {%s}.fill(last)", *bq, config.BrokerIDTag)
 	config.PartnQuery = fmt.Sprintf("%s.rollup(avg, %d)", *pq, config.Span)
 }