diff --git a/util/convertnhcb/convertnhcb.go b/util/convertnhcb/convertnhcb.go
index ee5bcb72de..ce8fdda899 100644
--- a/util/convertnhcb/convertnhcb.go
+++ b/util/convertnhcb/convertnhcb.go
@@ -139,21 +139,17 @@ func (h TempHistogram) Convert() (*histogram.Histogram, *histogram.FloatHistogra
 		return nil, nil, h.err
 	}
 
+	if !h.hasCount && len(h.buckets) > 0 {
+		// No count, so set count to the highest known bucket's count.
+		h.count = h.buckets[len(h.buckets)-1].count
+	}
+
 	if len(h.buckets) == 0 || h.buckets[len(h.buckets)-1].le != math.Inf(1) {
 		// No +Inf bucket.
-		if !h.hasCount && len(h.buckets) > 0 {
-			// No count either, so set count to the last known bucket's count.
-			h.count = h.buckets[len(h.buckets)-1].count
-		}
 		// Let the last bucket be +Inf with the overall count.
 		h.buckets = append(h.buckets, tempHistogramBucket{le: math.Inf(1), count: h.count})
 	}
 
-	if !h.hasCount {
-		h.count = h.buckets[len(h.buckets)-1].count
-		h.hasCount = true
-	}
-
 	for _, b := range h.buckets {
 		intCount := int64(math.Round(b.count))
 		if b.count != float64(intCount) {