diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7fe4ff88590..e0b964dfb6d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -57,6 +57,7 @@
 * [ENHANCEMENT] Upgrade Thanos and promql-engine to latest. #7740
 * [ENHANCEMENT] Ruler: Adjust ruler frontend decoder to not wrap query error messages with execution prefix, this makes error responses consistent between internal and external ruler paths. #7741
 * [ENHANCEMENT] Distributor: Deduplicate metric metadata when converting PRW 2.0 requests. PRW 2.0 attaches metadata to every series, so a metric family was previously expanded into one `MetricMetadata` per series. #7760
+* [ENHANCEMENT] Querier: Use non-pointer HistogramBucket slice in response codec. #7809
 * [BUGFIX] Querier: Fix queryWithRetry and labelsWithRetry returning (nil, nil) on cancelled context by propagating ctx.Err(). #7370
 * [BUGFIX] Metrics Helper: Fix non-deterministic bucket order in merged histograms by sorting buckets after map iteration, matching Prometheus client library behavior. #7380
 * [BUGFIX] Distributor: Return HTTP 401 Unauthorized when tenant ID resolution fails in the Prometheus Remote Write 2.0 path. #7389
diff --git a/pkg/querier/codec/protobuf_codec.go b/pkg/querier/codec/protobuf_codec.go
index 36c84ff553d..b61331983a2 100644
--- a/pkg/querier/codec/protobuf_codec.go
+++ b/pkg/querier/codec/protobuf_codec.go
@@ -209,8 +209,8 @@ func getVectorSamples(data *v1.QueryData, cortexInternal bool) *[]tripperware.Sa
 	return &vectorSamples
 }
 
-func getBuckets(bucketsLen int, it histogram.BucketIterator[float64]) []*tripperware.HistogramBucket {
-	buckets := make([]*tripperware.HistogramBucket, bucketsLen)
+func getBuckets(bucketsLen int, it histogram.BucketIterator[float64]) []tripperware.HistogramBucket {
+	buckets := make([]tripperware.HistogramBucket, bucketsLen)
 	bucketIdx := 0
 	for it.Next() {
 		bucket := it.At()
@@ -229,7 +229,7 @@ func getBuckets(bucketsLen int, it histogram.BucketIterator[float64]) []*tripper
 				boundaries = 0 // Inclusive only on upper end AKA left open.
 			}
 		}
-		buckets[bucketIdx] = &tripperware.HistogramBucket{
+		buckets[bucketIdx] = tripperware.HistogramBucket{
 			Boundaries: int32(boundaries),
 			Lower:      bucket.Lower,
 			Upper:      bucket.Upper,
diff --git a/pkg/querier/codec/protobuf_codec_test.go b/pkg/querier/codec/protobuf_codec_test.go
index 5d78fe6668a..9de2df2f40e 100644
--- a/pkg/querier/codec/protobuf_codec_test.go
+++ b/pkg/querier/codec/protobuf_codec_test.go
@@ -249,7 +249,7 @@ func TestProtobufCodec_Encode(t *testing.T) {
 												Histogram: tripperware.SampleHistogram{
 													Count: 10,
 													Sum:   20,
-													Buckets: []*tripperware.HistogramBucket{
+													Buckets: []tripperware.HistogramBucket{
 														{
 															Boundaries: 1,
 															Upper:      -1.414213562373095,
@@ -342,7 +342,7 @@ func TestProtobufCodec_Encode(t *testing.T) {
 												Histogram: tripperware.SampleHistogram{
 													Count:   0,
 													Sum:     1,
-													Buckets: []*tripperware.HistogramBucket{},
+													Buckets: []tripperware.HistogramBucket{},
 												},
 											},
 										},
@@ -386,7 +386,7 @@ func TestProtobufCodec_Encode(t *testing.T) {
 											Histogram: tripperware.SampleHistogram{
 												Count: 10,
 												Sum:   20,
-												Buckets: []*tripperware.HistogramBucket{
+												Buckets: []tripperware.HistogramBucket{
 													{
 														Boundaries: 1,
 														Upper:      -1.414213562373095,
@@ -478,7 +478,7 @@ func TestProtobufCodec_Encode(t *testing.T) {
 											Histogram: tripperware.SampleHistogram{
 												Count:   0,
 												Sum:     1,
-												Buckets: []*tripperware.HistogramBucket{},
+												Buckets: []tripperware.HistogramBucket{},
 											},
 										},
 									},
diff --git a/pkg/querier/tripperware/instantquery/instant_query_test.go b/pkg/querier/tripperware/instantquery/instant_query_test.go
index 2e56eecd685..1fba5c5e21c 100644
--- a/pkg/querier/tripperware/instantquery/instant_query_test.go
+++ b/pkg/querier/tripperware/instantquery/instant_query_test.go
@@ -252,7 +252,7 @@ func TestResponse(t *testing.T) {
 											Histogram: tripperware.SampleHistogram{
 												Count: 6342,
 												Sum:   43.31319875499995,
-												Buckets: []*tripperware.HistogramBucket{
+												Buckets: []tripperware.HistogramBucket{
 													{Boundaries: 0, Upper: 0.0015060652591874421, Lower: 0.0013810679320049755, Count: 1},
 													{Boundaries: 0, Upper: 0.001642375811042411, Lower: 0.0015060652591874421, Count: 7},
 													{Boundaries: 0, Upper: 0.0017910235218841233, Lower: 0.001642375811042411, Count: 5},
diff --git a/pkg/querier/tripperware/merge_test.go b/pkg/querier/tripperware/merge_test.go
index b4064b390f9..d575d3d6ba6 100644
--- a/pkg/querier/tripperware/merge_test.go
+++ b/pkg/querier/tripperware/merge_test.go
@@ -15,7 +15,7 @@ var (
 	testHistogram1 = SampleHistogram{
 		Count: 13.5,
 		Sum:   3897.1,
-		Buckets: []*HistogramBucket{
+		Buckets: []HistogramBucket{
 			{
 				Boundaries: 1,
 				Lower:      -4870.992343051145,
diff --git a/pkg/querier/tripperware/query.go b/pkg/querier/tripperware/query.go
index 8742c71698f..6a3f047ad51 100644
--- a/pkg/querier/tripperware/query.go
+++ b/pkg/querier/tripperware/query.go
@@ -637,44 +637,44 @@ func UnmarshalSampleHistogramPairJSON(ptr unsafe.Pointer, iter *jsoniter.Iterato
 }
 
 // Adapted from https://github.com/prometheus/client_golang/blob/4b158abea9470f75b6f07460cdc2189b91914562/api/prometheus/v1/api.go#L252.
-func unmarshalHistogramBucket(iter *jsoniter.Iterator) (*HistogramBucket, error) {
+func unmarshalHistogramBucket(iter *jsoniter.Iterator) (HistogramBucket, error) {
 	b := HistogramBucket{}
 	if !iter.ReadArray() {
-		return nil, errors.New("HistogramBucket must be [boundaries, lower, upper, count]")
+		return b, errors.New("HistogramBucket must be [boundaries, lower, upper, count]")
 	}
 	boundaries, err := iter.ReadNumber().Int64()
 	if err != nil {
-		return nil, err
+		return b, err
 	}
 	b.Boundaries = int32(boundaries)
 	if !iter.ReadArray() {
-		return nil, errors.New("HistogramBucket must be [boundaries, lower, upper, count]")
+		return b, errors.New("HistogramBucket must be [boundaries, lower, upper, count]")
 	}
 	f, err := strconv.ParseFloat(iter.ReadString(), 64)
 	if err != nil {
-		return nil, err
+		return b, err
 	}
 	b.Lower = f
 	if !iter.ReadArray() {
-		return nil, errors.New("HistogramBucket must be [boundaries, lower, upper, count]")
+		return b, errors.New("HistogramBucket must be [boundaries, lower, upper, count]")
 	}
 	f, err = strconv.ParseFloat(iter.ReadString(), 64)
 	if err != nil {
-		return nil, err
+		return b, err
 	}
 	b.Upper = f
 	if !iter.ReadArray() {
-		return nil, errors.New("HistogramBucket must be [boundaries, lower, upper, count]")
+		return b, errors.New("HistogramBucket must be [boundaries, lower, upper, count]")
 	}
 	f, err = strconv.ParseFloat(iter.ReadString(), 64)
 	if err != nil {
-		return nil, err
+		return b, err
 	}
 	b.Count = f
 	if iter.ReadArray() {
-		return nil, errors.New("HistogramBucket has too many values, must be [boundaries, lower, upper, count]")
+		return b, errors.New("HistogramBucket has too many values, must be [boundaries, lower, upper, count]")
 	}
-	return &b, nil
+	return b, nil
 }
 
 // Adapted from https://github.com/prometheus/client_golang/blob/4b158abea9470f75b6f07460cdc2189b91914562/api/prometheus/v1/api.go#L137.
@@ -731,7 +731,7 @@ func marshalHistogram(h SampleHistogram, stream *jsoniter.Stream) {
 			stream.WriteArrayStart()
 		}
 		bucketFound = true
-		marshalHistogramBucket(*bucket, stream)
+		marshalHistogramBucket(bucket, stream)
 	}
 
 	if bucketFound {
diff --git a/pkg/querier/tripperware/query.pb.go b/pkg/querier/tripperware/query.pb.go
index a428eaf1bd2..fca1fcc6a93 100644
--- a/pkg/querier/tripperware/query.pb.go
+++ b/pkg/querier/tripperware/query.pb.go
@@ -404,9 +404,9 @@ func (m *SampleHistogramPair) GetHistogram() SampleHistogram {
 }
 
 type SampleHistogram struct {
-	Count   float64            `protobuf:"fixed64,1,opt,name=count,proto3" json:"count,omitempty"`
-	Sum     float64            `protobuf:"fixed64,2,opt,name=sum,proto3" json:"sum,omitempty"`
-	Buckets []*HistogramBucket `protobuf:"bytes,3,rep,name=buckets,proto3" json:"buckets,omitempty"`
+	Count   float64           `protobuf:"fixed64,1,opt,name=count,proto3" json:"count,omitempty"`
+	Sum     float64           `protobuf:"fixed64,2,opt,name=sum,proto3" json:"sum,omitempty"`
+	Buckets []HistogramBucket `protobuf:"bytes,3,rep,name=buckets,proto3" json:"buckets"`
 }
 
 func (m *SampleHistogram) Reset()      { *m = SampleHistogram{} }
@@ -455,7 +455,7 @@ func (m *SampleHistogram) GetSum() float64 {
 	return 0
 }
 
-func (m *SampleHistogram) GetBuckets() []*HistogramBucket {
+func (m *SampleHistogram) GetBuckets() []HistogramBucket {
 	if m != nil {
 		return m.Buckets
 	}
@@ -1003,85 +1003,85 @@ func init() {
 func init() { proto.RegisterFile("query.proto", fileDescriptor_5c6ac9b241082464) }
 
 var fileDescriptor_5c6ac9b241082464 = []byte{
-	// 1233 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x56, 0xcd, 0x6f, 0x1b, 0x45,
-	0x14, 0xf7, 0xc6, 0xf6, 0x26, 0x7e, 0x4e, 0x93, 0x32, 0xe9, 0x87, 0x53, 0xca, 0xae, 0x59, 0x81,
-	0x14, 0x04, 0x75, 0x44, 0x2a, 0x40, 0x80, 0xa8, 0xe8, 0x42, 0x21, 0x2d, 0x94, 0xb6, 0x93, 0xaa,
-	0x48, 0x5c, 0xaa, 0xb1, 0x3d, 0x75, 0x96, 0x78, 0x3f, 0x3a, 0x3b, 0xdb, 0xc4, 0x9c, 0x38, 0x73,
-	0xe2, 0x8c, 0xc4, 0x81, 0x1b, 0x07, 0xfe, 0x90, 0x1c, 0x2b, 0x4e, 0x15, 0x12, 0x2b, 0xea, 0x5c,
-	0xd0, 0x9e, 0xfa, 0x27, 0xa0, 0xf9, 0xd8, 0xf5, 0x3a, 0x71, 0x12, 0xf5, 0xc4, 0xc5, 0xd9, 0x79,
-	0xef, 0xf7, 0x7b, 0x5f, 0xf3, 0xde, 0x9b, 0x40, 0xf3, 0x71, 0x42, 0xd9, 0xa8, 0x13, 0xb1, 0x90,
-	0x87, 0xa8, 0xc9, 0x99, 0x17, 0x45, 0x94, 0xed, 0x12, 0x46, 0x2f, 0x9d, 0x1b, 0x84, 0x83, 0x50,
-	0xca, 0xd7, 0xc5, 0x97, 0x82, 0x5c, 0xb2, 0x06, 0x61, 0x38, 0x18, 0xd2, 0x75, 0x79, 0xea, 0x26,
-	0x8f, 0xd6, 0xfb, 0x09, 0x23, 0xdc, 0x0b, 0x03, 0xad, 0x5f, 0x3d, 0xac, 0x27, 0x81, 0xb6, 0x7e,
-	0xe9, 0xc3, 0x81, 0xc7, 0xb7, 0x93, 0x6e, 0xa7, 0x17, 0xfa, 0xeb, 0xbd, 0x90, 0x71, 0xba, 0x17,
-	0xb1, 0xf0, 0x7b, 0xda, 0xe3, 0xfa, 0xb4, 0x1e, 0xed, 0x0c, 0x72, 0x45, 0x57, 0x7f, 0x28, 0xaa,
-	0xf3, 0x53, 0x15, 0xd0, 0x5d, 0x16, 0xfa, 0x94, 0x6f, 0xd3, 0x24, 0xc6, 0x34, 0x8e, 0xc2, 0x20,
-	0xa6, 0xc8, 0x01, 0x73, 0x8b, 0x13, 0x9e, 0xc4, 0x2d, 0xa3, 0x6d, 0xac, 0x35, 0x5c, 0xc8, 0x52,
-	0xdb, 0x8c, 0xa5, 0x04, 0x6b, 0x0d, 0xfa, 0x12, 0x6a, 0x9f, 0x13, 0x4e, 0x5a, 0x73, 0x6d, 0x63,
-	0xad, 0xb9, 0xf1, 0x6a, 0xa7, 0x94, 0x62, 0x67, 0x62, 0x52, 0x40, 0xdc, 0x0b, 0xfb, 0xa9, 0x5d,
-	0xc9, 0x52, 0x7b, 0xa9, 0x4f, 0x38, 0x79, 0x27, 0xf4, 0x3d, 0x4e, 0xfd, 0x88, 0x8f, 0xb0, 0x34,
-	0x80, 0xde, 0x83, 0xc6, 0x0d, 0xc6, 0x42, 0x76, 0x7f, 0x14, 0xd1, 0x56, 0x55, 0xfa, 0xbb, 0x98,
-	0xa5, 0xf6, 0x0a, 0xcd, 0x85, 0x25, 0xc6, 0x04, 0x89, 0xde, 0x82, 0xba, 0x3c, 0xb4, 0x6a, 0x92,
-	0xb2, 0x92, 0xa5, 0xf6, 0xb2, 0xa4, 0x94, 0xe0, 0x0a, 0x81, 0xbe, 0x80, 0xf9, 0x4d, 0x4a, 0xfa,
-	0x94, 0xc5, 0xad, 0x7a, 0xbb, 0xba, 0xd6, 0xdc, 0x78, 0xf3, 0x98, 0x68, 0xf3, 0x02, 0x28, 0xb4,
-	0x5b, 0xcf, 0x52, 0xdb, 0xb8, 0x82, 0x73, 0x32, 0xda, 0x80, 0x85, 0x6f, 0x09, 0x0b, 0xbc, 0x60,
-	0x10, 0xb7, 0xcc, 0x76, 0x75, 0xad, 0xe1, 0x5e, 0xc8, 0x52, 0x1b, 0xed, 0x6a, 0x59, 0xc9, 0x71,
-	0x81, 0x13, 0x61, 0xde, 0x0c, 0x1e, 0x85, 0x71, 0x6b, 0x5e, 0x12, 0x64, 0x98, 0x9e, 0x10, 0x94,
-	0xc3, 0x94, 0x08, 0xe7, 0x6f, 0x03, 0x96, 0xa6, 0x2b, 0x87, 0x3a, 0x00, 0x98, 0xc6, 0xc9, 0x90,
-	0xcb, 0xe2, 0xa8, 0xcb, 0x58, 0xca, 0x52, 0x1b, 0x58, 0x21, 0xc5, 0x25, 0x04, 0xba, 0x05, 0xa6,
-	0x3a, 0xe9, 0x6b, 0x71, 0x8e, 0x49, 0xf4, 0x9e, 0x68, 0x4e, 0x85, 0x74, 0x97, 0xf4, 0xed, 0x98,
-	0xca, 0x26, 0xd6, 0x16, 0xd0, 0x1d, 0xa8, 0x8b, 0x2b, 0x8f, 0xe5, 0x9d, 0x34, 0x37, 0xde, 0x38,
-	0xa5, 0x66, 0xa2, 0x2d, 0x62, 0x95, 0x9f, 0xa4, 0x95, 0xf3, 0x93, 0x02, 0x67, 0x07, 0x96, 0x3e,
-	0x23, 0xbd, 0x6d, 0xda, 0x2f, 0xfa, 0x6c, 0x15, 0xaa, 0x3b, 0x74, 0xa4, 0xf3, 0x9a, 0xcf, 0x52,
-	0x5b, 0x1c, 0xb1, 0xf8, 0x41, 0xd7, 0x60, 0x9e, 0xee, 0x71, 0x1a, 0xf0, 0xb8, 0x35, 0x27, 0xef,
-	0x6c, 0x65, 0xca, 0xff, 0x0d, 0xa9, 0x73, 0x97, 0x75, 0xec, 0x39, 0x16, 0xe7, 0x1f, 0xce, 0x1f,
-	0x06, 0x98, 0x0a, 0x84, 0x6c, 0x99, 0x08, 0xe3, 0xd2, 0x4f, 0xd5, 0x6d, 0x64, 0xa9, 0xad, 0x04,
-	0x58, 0xfd, 0x11, 0x61, 0xd0, 0xa0, 0x2f, 0x4b, 0x56, 0x55, 0x61, 0xd0, 0xa0, 0x8f, 0xc5, 0x0f,
-	0x6a, 0xc3, 0x02, 0x67, 0xa4, 0x47, 0x1f, 0x7a, 0x7d, 0xdd, 0x68, 0x79, 0x53, 0x48, 0xf1, 0xcd,
-	0x3e, 0xba, 0x06, 0x0b, 0x4c, 0xe7, 0xd3, 0xaa, 0xcb, 0x4a, 0x9d, 0xeb, 0xa8, 0x59, 0xed, 0xe4,
-	0xb3, 0xda, 0xb9, 0x1e, 0x8c, 0xdc, 0xc5, 0x2c, 0xb5, 0x0b, 0x24, 0x2e, 0xbe, 0x6e, 0xd5, 0x16,
-	0xaa, 0x67, 0x6b, 0xce, 0x2f, 0x73, 0xb0, 0xb8, 0x45, 0xfc, 0x68, 0x48, 0xb7, 0x38, 0xa3, 0xc4,
-	0x47, 0x7b, 0x60, 0x0e, 0x49, 0x97, 0x0e, 0xc5, 0x08, 0xaa, 0xf4, 0xf3, 0x09, 0xee, 0x7c, 0x2d,
-	0xe4, 0x77, 0x89, 0xc7, 0xdc, 0xaf, 0x44, 0xfa, 0x7f, 0xa5, 0xf6, 0x4b, 0x6d, 0x00, 0xc5, 0xbf,
-	0xde, 0x27, 0x11, 0xa7, 0x4c, 0xdc, 0xbb, 0x4f, 0x39, 0xf3, 0x7a, 0x58, 0xfb, 0x43, 0x1f, 0xc1,
-	0x7c, 0x2c, 0x23, 0xc9, 0x2b, 0x7f, 0x76, 0xe2, 0x5a, 0x85, 0x38, 0x69, 0x99, 0x27, 0x64, 0x98,
-	0xd0, 0x18, 0xe7, 0x04, 0x74, 0x1f, 0x60, 0xdb, 0x8b, 0x79, 0x38, 0x60, 0xc4, 0x17, 0x8d, 0x23,
-	0xe8, 0xed, 0xa9, 0x8b, 0x53, 0x16, 0x36, 0x73, 0x90, 0x4c, 0x03, 0x69, 0x73, 0x25, 0x2e, 0x2e,
-	0x7d, 0x3b, 0x3f, 0xc0, 0xca, 0x0c, 0x1a, 0x7a, 0x1d, 0x16, 0xb9, 0xe7, 0xd3, 0x98, 0x13, 0x3f,
-	0x7a, 0xe8, 0xab, 0x5d, 0x55, 0xc5, 0xcd, 0x42, 0x76, 0x3b, 0x46, 0x9f, 0x42, 0xa3, 0xb0, 0xa3,
-	0x47, 0xe2, 0xf2, 0x49, 0xe1, 0xb8, 0x35, 0x11, 0x0a, 0x9e, 0x90, 0x9c, 0xc7, 0xb0, 0x7c, 0x08,
-	0x83, 0xce, 0x41, 0xbd, 0x17, 0x26, 0x81, 0xea, 0x27, 0x03, 0xab, 0x03, 0x3a, 0x0b, 0xd5, 0x38,
-	0x51, 0x4e, 0x0c, 0x2c, 0x3e, 0xd1, 0xfb, 0x30, 0xdf, 0x4d, 0x7a, 0x3b, 0x94, 0xe7, 0x95, 0x98,
-	0x76, 0x3d, 0x71, 0x2a, 0x41, 0x38, 0x07, 0x3b, 0x31, 0x2c, 0x1f, 0xd2, 0x21, 0x0b, 0xa0, 0x1b,
-	0x26, 0x41, 0x9f, 0x30, 0x8f, 0xaa, 0x44, 0xeb, 0xb8, 0x24, 0x11, 0x21, 0x0d, 0xc3, 0x5d, 0xca,
-	0xb4, 0x7b, 0x75, 0x10, 0xd2, 0x44, 0xb8, 0x93, 0x13, 0x6c, 0x60, 0x75, 0x98, 0x84, 0x5f, 0x2b,
-	0x85, 0xef, 0xf8, 0x70, 0xf1, 0x98, 0x99, 0x46, 0x78, 0xd2, 0x10, 0x86, 0x2c, 0xe1, 0xdb, 0xa7,
-	0xad, 0x02, 0x85, 0x56, 0x1b, 0xa1, 0x29, 0xc6, 0x53, 0xf3, 0x8b, 0x46, 0x71, 0xf6, 0xe7, 0xc0,
-	0x3a, 0x99, 0x88, 0xee, 0xc0, 0x79, 0x1e, 0x72, 0x32, 0x94, 0xbb, 0x8a, 0x74, 0x87, 0xb9, 0x56,
-	0x8f, 0xf1, 0x6a, 0x96, 0xda, 0xb3, 0x01, 0x78, 0xb6, 0x18, 0xfd, 0x66, 0xc0, 0xe5, 0x99, 0x9a,
-	0xbb, 0x94, 0x6d, 0x71, 0x1a, 0xe9, 0x76, 0xff, 0xf8, 0x94, 0xec, 0x0e, 0xb3, 0x65, 0xb4, 0xda,
-	0x84, 0xdb, 0xce, 0x52, 0xfb, 0x44, 0x27, 0xf8, 0x44, 0x2d, 0x7a, 0x17, 0x9a, 0x11, 0x25, 0x3b,
-	0x79, 0xaa, 0x55, 0x99, 0xea, 0x72, 0x96, 0xda, 0x65, 0x31, 0x2e, 0x1f, 0x1c, 0x0f, 0x5e, 0x32,
-	0x48, 0xd1, 0x01, 0x72, 0x70, 0xf5, 0xc4, 0xa8, 0xc3, 0x91, 0x71, 0x9a, 0x3b, 0x32, 0x4e, 0xce,
-	0x7d, 0x68, 0x1d, 0xf7, 0x58, 0xa2, 0x55, 0xa8, 0x7d, 0x43, 0xfc, 0xfc, 0x91, 0xd2, 0x5b, 0x52,
-	0x8a, 0xd0, 0x6b, 0x60, 0x3e, 0x90, 0x8b, 0x42, 0x56, 0xb8, 0x50, 0x6a, 0xa1, 0xf3, 0xab, 0x01,
-	0xe7, 0x67, 0x3e, 0x4d, 0xe8, 0x0a, 0x98, 0x4f, 0x68, 0x8f, 0x87, 0x4c, 0x37, 0xde, 0xf4, 0x1b,
-	0xf0, 0x40, 0xaa, 0x36, 0x2b, 0x58, 0x83, 0xd0, 0x65, 0x58, 0x60, 0x64, 0xd7, 0x1d, 0x71, 0xaa,
-	0xa2, 0x5f, 0xdc, 0xac, 0xe0, 0x42, 0x22, 0x8c, 0xf9, 0x84, 0x33, 0x6f, 0x4f, 0x3f, 0x68, 0xd3,
-	0xc6, 0x6e, 0x4b, 0x95, 0x30, 0xa6, 0x40, 0xee, 0x02, 0xe8, 0x07, 0xd1, 0xf9, 0x04, 0x4c, 0xe5,
-	0x0a, 0x5d, 0x2d, 0x4f, 0xc2, 0xd1, 0x47, 0x49, 0x6f, 0x47, 0xb5, 0x43, 0x8a, 0x56, 0xff, 0x73,
-	0x0e, 0x4c, 0xa5, 0xf9, 0x1f, 0x97, 0xfa, 0x07, 0x60, 0xaa, 0x78, 0xf4, 0x16, 0x3c, 0xba, 0xd3,
-	0xcf, 0xec, 0xa7, 0xb6, 0x21, 0x9e, 0x46, 0xd9, 0x0d, 0x58, 0xc3, 0xd1, 0xbd, 0xf2, 0x06, 0x55,
-	0x85, 0x3b, 0x7d, 0xa1, 0xbf, 0xa2, 0x6d, 0x4d, 0xa8, 0xa5, 0x95, 0x8a, 0x5c, 0x58, 0x64, 0x64,
-	0xb7, 0x60, 0xc8, 0x3d, 0x34, 0x55, 0x8b, 0xc9, 0xf6, 0x6b, 0x68, 0x43, 0xc6, 0x15, 0x3c, 0xc5,
-	0x71, 0xee, 0x80, 0xa9, 0x6e, 0x0c, 0xdd, 0x80, 0x33, 0x71, 0xe9, 0xe1, 0xcc, 0x4b, 0xbb, 0x3a,
-	0x23, 0x48, 0x85, 0xd0, 0xf7, 0x33, 0xcd, 0x72, 0xaf, 0x3f, 0x7d, 0x6e, 0x55, 0x9e, 0x3d, 0xb7,
-	0x2a, 0x2f, 0x9e, 0x5b, 0xc6, 0x8f, 0x63, 0xcb, 0xf8, 0x7d, 0x6c, 0x19, 0xfb, 0x63, 0xcb, 0x78,
-	0x3a, 0xb6, 0x8c, 0x7f, 0xc6, 0x96, 0xf1, 0xef, 0xd8, 0xaa, 0xbc, 0x18, 0x5b, 0xc6, 0xcf, 0x07,
-	0x56, 0xe5, 0xe9, 0x81, 0x55, 0x79, 0x76, 0x60, 0x55, 0xbe, 0x2b, 0xff, 0x63, 0xdf, 0x35, 0xe5,
-	0x7b, 0x7f, 0xf5, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x32, 0xa5, 0x92, 0x82, 0xfb, 0x0b, 0x00,
-	0x00,
+	// 1235 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x56, 0x4b, 0x6f, 0x1b, 0xd5,
+	0x17, 0xf7, 0xc4, 0xf6, 0xd8, 0x3e, 0x4e, 0x93, 0xfe, 0x6f, 0xfa, 0x70, 0xfa, 0x2f, 0x33, 0x66,
+	0x04, 0x52, 0x10, 0xd4, 0x11, 0xa9, 0x10, 0xe2, 0x55, 0xd1, 0x81, 0x42, 0x5a, 0x28, 0x6d, 0x6f,
+	0xaa, 0x22, 0xb1, 0xa9, 0xae, 0xed, 0x5b, 0x67, 0x88, 0xe7, 0xc1, 0x9d, 0x3b, 0x75, 0xcc, 0x8a,
+	0x35, 0x2b, 0xd6, 0x48, 0x2c, 0xd8, 0xb1, 0xe0, 0x83, 0x64, 0x59, 0xb1, 0xaa, 0x90, 0x18, 0x51,
+	0x77, 0x83, 0x66, 0xd5, 0x8f, 0x80, 0xee, 0x63, 0xec, 0x71, 0xe2, 0x24, 0xea, 0x8a, 0x8d, 0x33,
+	0xf7, 0x9c, 0xdf, 0xef, 0xbc, 0xee, 0x39, 0xe7, 0x06, 0x9a, 0xdf, 0x25, 0x94, 0x8d, 0x3b, 0x11,
+	0x0b, 0x79, 0x88, 0x9a, 0x9c, 0x79, 0x51, 0x44, 0xd9, 0x88, 0x30, 0x7a, 0xe9, 0xdc, 0x20, 0x1c,
+	0x84, 0x52, 0xbe, 0x29, 0xbe, 0x14, 0xe4, 0x92, 0x35, 0x08, 0xc3, 0xc1, 0x90, 0x6e, 0xca, 0x53,
+	0x37, 0x79, 0xb4, 0xd9, 0x4f, 0x18, 0xe1, 0x5e, 0x18, 0x68, 0xfd, 0xfa, 0x61, 0x3d, 0x09, 0xb4,
+	0xf5, 0x4b, 0xef, 0x0d, 0x3c, 0xbe, 0x9b, 0x74, 0x3b, 0xbd, 0xd0, 0xdf, 0xec, 0x85, 0x8c, 0xd3,
+	0xfd, 0x88, 0x85, 0xdf, 0xd2, 0x1e, 0xd7, 0xa7, 0xcd, 0x68, 0x6f, 0x90, 0x2b, 0xba, 0xfa, 0x43,
+	0x51, 0x9d, 0x1f, 0xcb, 0x80, 0xee, 0xb2, 0xd0, 0xa7, 0x7c, 0x97, 0x26, 0x31, 0xa6, 0x71, 0x14,
+	0x06, 0x31, 0x45, 0x0e, 0x98, 0x3b, 0x9c, 0xf0, 0x24, 0x6e, 0x19, 0x6d, 0x63, 0xa3, 0xe1, 0x42,
+	0x96, 0xda, 0x66, 0x2c, 0x25, 0x58, 0x6b, 0xd0, 0xe7, 0x50, 0xf9, 0x94, 0x70, 0xd2, 0x5a, 0x6a,
+	0x1b, 0x1b, 0xcd, 0xad, 0xff, 0x77, 0x0a, 0x29, 0x76, 0x66, 0x26, 0x05, 0xc4, 0xbd, 0x70, 0x90,
+	0xda, 0xa5, 0x2c, 0xb5, 0x57, 0xfa, 0x84, 0x93, 0xb7, 0x42, 0xdf, 0xe3, 0xd4, 0x8f, 0xf8, 0x18,
+	0x4b, 0x03, 0xe8, 0x1d, 0x68, 0xdc, 0x60, 0x2c, 0x64, 0xf7, 0xc7, 0x11, 0x6d, 0x95, 0xa5, 0xbf,
+	0x8b, 0x59, 0x6a, 0xaf, 0xd1, 0x5c, 0x58, 0x60, 0xcc, 0x90, 0xe8, 0x0d, 0xa8, 0xca, 0x43, 0xab,
+	0x22, 0x29, 0x6b, 0x59, 0x6a, 0xaf, 0x4a, 0x4a, 0x01, 0xae, 0x10, 0xe8, 0x33, 0xa8, 0x6d, 0x53,
+	0xd2, 0xa7, 0x2c, 0x6e, 0x55, 0xdb, 0xe5, 0x8d, 0xe6, 0xd6, 0xeb, 0xc7, 0x44, 0x9b, 0x17, 0x40,
+	0xa1, 0xdd, 0x6a, 0x96, 0xda, 0xc6, 0x15, 0x9c, 0x93, 0xd1, 0x16, 0xd4, 0xbf, 0x26, 0x2c, 0xf0,
+	0x82, 0x41, 0xdc, 0x32, 0xdb, 0xe5, 0x8d, 0x86, 0x7b, 0x21, 0x4b, 0x6d, 0x34, 0xd2, 0xb2, 0x82,
+	0xe3, 0x29, 0x4e, 0x84, 0x79, 0x33, 0x78, 0x14, 0xc6, 0xad, 0x9a, 0x24, 0xc8, 0x30, 0x3d, 0x21,
+	0x28, 0x86, 0x29, 0x11, 0xce, 0x5f, 0x06, 0xac, 0xcc, 0x57, 0x0e, 0x75, 0x00, 0x30, 0x8d, 0x93,
+	0x21, 0x97, 0xc5, 0x51, 0x97, 0xb1, 0x92, 0xa5, 0x36, 0xb0, 0xa9, 0x14, 0x17, 0x10, 0xe8, 0x16,
+	0x98, 0xea, 0xa4, 0xaf, 0xc5, 0x39, 0x26, 0xd1, 0x7b, 0xa2, 0x39, 0x15, 0xd2, 0x5d, 0xd1, 0xb7,
+	0x63, 0x2a, 0x9b, 0x58, 0x5b, 0x40, 0x77, 0xa0, 0x2a, 0xae, 0x3c, 0x96, 0x77, 0xd2, 0xdc, 0x7a,
+	0xed, 0x94, 0x9a, 0x89, 0xb6, 0x88, 0x55, 0x7e, 0x92, 0x56, 0xcc, 0x4f, 0x0a, 0x9c, 0x3d, 0x58,
+	0xf9, 0x84, 0xf4, 0x76, 0x69, 0x7f, 0xda, 0x67, 0xeb, 0x50, 0xde, 0xa3, 0x63, 0x9d, 0x57, 0x2d,
+	0x4b, 0x6d, 0x71, 0xc4, 0xe2, 0x07, 0x5d, 0x83, 0x1a, 0xdd, 0xe7, 0x34, 0xe0, 0x71, 0x6b, 0x49,
+	0xde, 0xd9, 0xda, 0x9c, 0xff, 0x1b, 0x52, 0xe7, 0xae, 0xea, 0xd8, 0x73, 0x2c, 0xce, 0x3f, 0x9c,
+	0xdf, 0x0d, 0x30, 0x15, 0x08, 0xd9, 0x32, 0x11, 0xc6, 0xa5, 0x9f, 0xb2, 0xdb, 0xc8, 0x52, 0x5b,
+	0x09, 0xb0, 0xfa, 0x23, 0xc2, 0xa0, 0x41, 0x5f, 0x96, 0xac, 0xac, 0xc2, 0xa0, 0x41, 0x1f, 0x8b,
+	0x1f, 0xd4, 0x86, 0x3a, 0x67, 0xa4, 0x47, 0x1f, 0x7a, 0x7d, 0xdd, 0x68, 0x79, 0x53, 0x48, 0xf1,
+	0xcd, 0x3e, 0xba, 0x06, 0x75, 0xa6, 0xf3, 0x69, 0x55, 0x65, 0xa5, 0xce, 0x75, 0xd4, 0xac, 0x76,
+	0xf2, 0x59, 0xed, 0x5c, 0x0f, 0xc6, 0xee, 0x72, 0x96, 0xda, 0x53, 0x24, 0x9e, 0x7e, 0xdd, 0xaa,
+	0xd4, 0xcb, 0x67, 0x2b, 0xce, 0xcf, 0x4b, 0xb0, 0xbc, 0x43, 0xfc, 0x68, 0x48, 0x77, 0x38, 0xa3,
+	0xc4, 0x47, 0xfb, 0x60, 0x0e, 0x49, 0x97, 0x0e, 0xc5, 0x08, 0xaa, 0xf4, 0xf3, 0x09, 0xee, 0x7c,
+	0x29, 0xe4, 0x77, 0x89, 0xc7, 0xdc, 0x2f, 0x44, 0xfa, 0x7f, 0xa6, 0xf6, 0x4b, 0x6d, 0x00, 0xc5,
+	0xbf, 0xde, 0x27, 0x11, 0xa7, 0x4c, 0xdc, 0xbb, 0x4f, 0x39, 0xf3, 0x7a, 0x58, 0xfb, 0x43, 0xef,
+	0x43, 0x2d, 0x96, 0x91, 0xe4, 0x95, 0x3f, 0x3b, 0x73, 0xad, 0x42, 0x9c, 0xb5, 0xcc, 0x63, 0x32,
+	0x4c, 0x68, 0x8c, 0x73, 0x02, 0xba, 0x0f, 0xb0, 0xeb, 0xc5, 0x3c, 0x1c, 0x30, 0xe2, 0x8b, 0xc6,
+	0x11, 0xf4, 0xf6, 0xdc, 0xc5, 0x29, 0x0b, 0xdb, 0x39, 0x48, 0xa6, 0x81, 0xb4, 0xb9, 0x02, 0x17,
+	0x17, 0xbe, 0x9d, 0xef, 0x61, 0x6d, 0x01, 0x0d, 0xbd, 0x0a, 0xcb, 0xdc, 0xf3, 0x69, 0xcc, 0x89,
+	0x1f, 0x3d, 0xf4, 0xd5, 0xae, 0x2a, 0xe3, 0xe6, 0x54, 0x76, 0x3b, 0x46, 0x1f, 0x43, 0x63, 0x6a,
+	0x47, 0x8f, 0xc4, 0xe5, 0x93, 0xc2, 0x71, 0x2b, 0x22, 0x14, 0x3c, 0x23, 0x39, 0x23, 0x58, 0x3d,
+	0x84, 0x41, 0xe7, 0xa0, 0xda, 0x0b, 0x93, 0x40, 0xf5, 0x93, 0x81, 0xd5, 0x01, 0x9d, 0x85, 0x72,
+	0x9c, 0x28, 0x27, 0x06, 0x16, 0x9f, 0xe8, 0x43, 0xa8, 0x75, 0x93, 0xde, 0x1e, 0xe5, 0x79, 0x25,
+	0xe6, 0x5d, 0xcf, 0x9c, 0x4a, 0x90, 0x76, 0x9d, 0x53, 0x9c, 0x18, 0x56, 0x0f, 0x21, 0x90, 0x05,
+	0xd0, 0x0d, 0x93, 0xa0, 0x4f, 0x98, 0x47, 0x55, 0xba, 0x55, 0x5c, 0x90, 0x88, 0xc0, 0x86, 0xe1,
+	0x88, 0x32, 0x1d, 0x84, 0x3a, 0x08, 0x69, 0x22, 0x9c, 0xca, 0x39, 0x36, 0xb0, 0x3a, 0xcc, 0x92,
+	0xa8, 0x14, 0x92, 0x70, 0x7c, 0xb8, 0x78, 0xcc, 0x64, 0x23, 0x3c, 0x6b, 0x0b, 0x43, 0x16, 0xf2,
+	0xcd, 0xd3, 0x16, 0x82, 0x42, 0xab, 0xbd, 0xd0, 0x14, 0x43, 0xaa, 0xf9, 0xd3, 0x76, 0x71, 0x0e,
+	0x96, 0xc0, 0x3a, 0x99, 0x88, 0xee, 0xc0, 0x79, 0x1e, 0x72, 0x32, 0x94, 0x1b, 0x8b, 0x74, 0x87,
+	0xb9, 0x56, 0x0f, 0xf3, 0x7a, 0x96, 0xda, 0x8b, 0x01, 0x78, 0xb1, 0x18, 0xfd, 0x6a, 0xc0, 0xe5,
+	0x85, 0x9a, 0xbb, 0x94, 0xed, 0x70, 0x1a, 0xe9, 0xa6, 0xff, 0xe0, 0x94, 0xec, 0x0e, 0xb3, 0x65,
+	0xb4, 0xda, 0x84, 0xdb, 0xce, 0x52, 0xfb, 0x44, 0x27, 0xf8, 0x44, 0x2d, 0x7a, 0x1b, 0x9a, 0x11,
+	0x25, 0x7b, 0x79, 0xaa, 0x65, 0x99, 0xea, 0x6a, 0x96, 0xda, 0x45, 0x31, 0x2e, 0x1e, 0x1c, 0x0f,
+	0x5e, 0x32, 0x48, 0xd1, 0x01, 0x72, 0x7c, 0xf5, 0xdc, 0xa8, 0xc3, 0x91, 0xa1, 0x5a, 0x3a, 0x32,
+	0x54, 0xce, 0x7d, 0x68, 0x1d, 0xf7, 0x64, 0xa2, 0x75, 0xa8, 0x7c, 0x45, 0xfc, 0xfc, 0xa9, 0xd2,
+	0xbb, 0x52, 0x8a, 0xd0, 0x2b, 0x60, 0x3e, 0x90, 0xeb, 0x42, 0x56, 0x78, 0xaa, 0xd4, 0x42, 0xe7,
+	0x17, 0x03, 0xce, 0x2f, 0x7c, 0xa0, 0xd0, 0x15, 0x30, 0x1f, 0xd3, 0x1e, 0x0f, 0x99, 0x6e, 0xbc,
+	0xf9, 0x97, 0xe0, 0x81, 0x54, 0x6d, 0x97, 0xb0, 0x06, 0xa1, 0xcb, 0x50, 0x67, 0x64, 0xe4, 0x8e,
+	0x39, 0x55, 0xd1, 0x2f, 0x6f, 0x97, 0xf0, 0x54, 0x22, 0x8c, 0xf9, 0x84, 0x33, 0x6f, 0x5f, 0x3f,
+	0x6b, 0xf3, 0xc6, 0x6e, 0x4b, 0x95, 0x30, 0xa6, 0x40, 0x6e, 0x1d, 0xf4, 0xb3, 0xe8, 0x7c, 0x04,
+	0xa6, 0x72, 0x85, 0xae, 0x16, 0x27, 0xe1, 0xe8, 0xd3, 0xa4, 0x77, 0xa4, 0x1e, 0xe7, 0xbc, 0xd5,
+	0xff, 0x58, 0x02, 0x53, 0x69, 0xfe, 0xc3, 0xd5, 0xfe, 0x2e, 0x98, 0x2a, 0x1e, 0xbd, 0x0b, 0x8f,
+	0x6e, 0xf6, 0x33, 0x07, 0xa9, 0x6d, 0x88, 0x07, 0x52, 0x76, 0x03, 0xd6, 0x70, 0x74, 0xaf, 0xb8,
+	0x47, 0x55, 0xe1, 0x4e, 0x5f, 0xeb, 0xff, 0xd3, 0xb6, 0x66, 0xd4, 0xc2, 0x62, 0x45, 0x2e, 0x2c,
+	0x33, 0x32, 0x9a, 0x32, 0xe4, 0x1e, 0x9a, 0xab, 0xc5, 0x6c, 0xfb, 0x35, 0xb4, 0x21, 0xe3, 0x0a,
+	0x9e, 0xe3, 0x38, 0x77, 0xc0, 0x54, 0x37, 0x86, 0x6e, 0xc0, 0x99, 0xb8, 0xf0, 0x7c, 0xe6, 0xa5,
+	0x5d, 0x5f, 0x10, 0xa4, 0x42, 0xe8, 0xfb, 0x99, 0x67, 0xb9, 0xd7, 0x9f, 0x3c, 0xb3, 0x4a, 0x4f,
+	0x9f, 0x59, 0xa5, 0x17, 0xcf, 0x2c, 0xe3, 0x87, 0x89, 0x65, 0xfc, 0x36, 0xb1, 0x8c, 0x83, 0x89,
+	0x65, 0x3c, 0x99, 0x58, 0xc6, 0xdf, 0x13, 0xcb, 0xf8, 0x67, 0x62, 0x95, 0x5e, 0x4c, 0x2c, 0xe3,
+	0xa7, 0xe7, 0x56, 0xe9, 0xc9, 0x73, 0xab, 0xf4, 0xf4, 0xb9, 0x55, 0xfa, 0xa6, 0xf8, 0xef, 0x7d,
+	0xd7, 0x94, 0xaf, 0xfe, 0xd5, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x01, 0x2a, 0x76, 0x30, 0x01,
+	0x0c, 0x00, 0x00,
 }
 
 func (this *PrometheusResponse) Equal(that interface{}) bool {
@@ -1337,7 +1337,7 @@ func (this *SampleHistogram) Equal(that interface{}) bool {
 		return false
 	}
 	for i := range this.Buckets {
-		if !this.Buckets[i].Equal(that1.Buckets[i]) {
+		if !this.Buckets[i].Equal(&that1.Buckets[i]) {
 			return false
 		}
 	}
@@ -1800,7 +1800,11 @@ func (this *SampleHistogram) GoString() string {
 	s = append(s, "Count: "+fmt.Sprintf("%#v", this.Count)+",\n")
 	s = append(s, "Sum: "+fmt.Sprintf("%#v", this.Sum)+",\n")
 	if this.Buckets != nil {
-		s = append(s, "Buckets: "+fmt.Sprintf("%#v", this.Buckets)+",\n")
+		vs := make([]*HistogramBucket, len(this.Buckets))
+		for i := range vs {
+			vs[i] = &this.Buckets[i]
+		}
+		s = append(s, "Buckets: "+fmt.Sprintf("%#v", vs)+",\n")
 	}
 	s = append(s, "}")
 	return strings.Join(s, "")
@@ -3255,9 +3259,9 @@ func (this *SampleHistogram) String() string {
 	if this == nil {
 		return "nil"
 	}
-	repeatedStringForBuckets := "[]*HistogramBucket{"
+	repeatedStringForBuckets := "[]HistogramBucket{"
 	for _, f := range this.Buckets {
-		repeatedStringForBuckets += strings.Replace(f.String(), "HistogramBucket", "HistogramBucket", 1) + ","
+		repeatedStringForBuckets += strings.Replace(strings.Replace(f.String(), "HistogramBucket", "HistogramBucket", 1), `&`, ``, 1) + ","
 	}
 	repeatedStringForBuckets += "}"
 	s := strings.Join([]string{`&SampleHistogram{`,
@@ -4473,7 +4477,7 @@ func (m *SampleHistogram) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.Buckets = append(m.Buckets, &HistogramBucket{})
+			m.Buckets = append(m.Buckets, HistogramBucket{})
 			if err := m.Buckets[len(m.Buckets)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
 			}
diff --git a/pkg/querier/tripperware/query.proto b/pkg/querier/tripperware/query.proto
index afef3d692bd..24e6a5d0377 100644
--- a/pkg/querier/tripperware/query.proto
+++ b/pkg/querier/tripperware/query.proto
@@ -58,7 +58,7 @@ message SampleHistogramPair {
 message SampleHistogram {
   double count = 1;
   double sum = 2;
-  repeated HistogramBucket buckets = 3;
+  repeated HistogramBucket buckets = 3 [(gogoproto.nullable) = false];
 }
 
 message HistogramBucket {
diff --git a/pkg/querier/tripperware/query_test.go b/pkg/querier/tripperware/query_test.go
index a5d210488d6..0ad5e34fd18 100644
--- a/pkg/querier/tripperware/query_test.go
+++ b/pkg/querier/tripperware/query_test.go
@@ -137,7 +137,7 @@ func generateData(timeseries, datapoints int) (floatMatrix, histogramMatrix []*S
 				Histogram: SampleHistogram{
 					Count: 13.5 * f,
 					Sum:   .1 * f,
-					Buckets: []*HistogramBucket{
+					Buckets: []HistogramBucket{
 						{
 							Boundaries: 1,
 							Lower:      -4870.992343051145,