diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4b961d65ea..246d0808f1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,8 @@ We use *breaking :warning:* to mark changes that are not backward compatible (re
 
 ### Fixed
 
+- [#7493](https://github.com/thanos-io/thanos/pull/7493) *: fix server grpc histograms
+
 ### Added
 
 ### Changed
diff --git a/pkg/server/grpc/grpc.go b/pkg/server/grpc/grpc.go
index 3198fb7cb1..57b063d9b0 100644
--- a/pkg/server/grpc/grpc.go
+++ b/pkg/server/grpc/grpc.go
@@ -59,10 +59,10 @@ func New(logger log.Logger, reg prometheus.Registerer, tracer opentracing.Tracer
 
 	met := grpc_prometheus.NewServerMetrics(
 		grpc_prometheus.WithServerHandlingTimeHistogram(
-			grpc_prometheus.WithHistogramBuckets([]float64{0.001, 0.01, 0.1, 0.3, 0.6, 1, 3, 6, 9, 20, 30, 60, 90, 120}),
 			grpc_prometheus.WithHistogramOpts(&prometheus.HistogramOpts{
-				NativeHistogramBucketFactor:    1.1,
+				Buckets:                        []float64{0.001, 0.01, 0.1, 0.3, 0.6, 1, 3, 6, 9, 20, 30, 60, 90, 120},
 				NativeHistogramMaxBucketNumber: 256,
+				NativeHistogramBucketFactor:    1.1,
 			}),
 		),
 	)