diff --git a/prometheus/promhttp/instrument_client.go b/prometheus/promhttp/instrument_client.go
index d3482c40c..002a9af09 100644
--- a/prometheus/promhttp/instrument_client.go
+++ b/prometheus/promhttp/instrument_client.go
@@ -70,11 +70,12 @@ func InstrumentRoundTripperCounter(counter *prometheus.CounterVec, next http.Rou
 
 	// Curry the counter with dynamic labels before checking the remaining labels.
 	code, method := checkLabels(counter.MustCurryWith(rtOpts.emptyDynamicLabels()))
+	hasExtraLabels := len(rtOpts.extraLabelsFromCtx) > 0
 
 	return func(r *http.Request) (*http.Response, error) {
 		resp, err := next.RoundTrip(r)
 		if err == nil {
-			l := labels(code, method, r.Method, resp.StatusCode, rtOpts.extraMethods...)
+			l := labels(code, method, hasExtraLabels, r.Method, resp.StatusCode, rtOpts.extraMethods...)
 			for label, resolve := range rtOpts.extraLabelsFromCtx {
 				l[label] = resolve(resp.Request.Context())
 			}
@@ -113,12 +114,13 @@ func InstrumentRoundTripperDuration(obs prometheus.ObserverVec, next http.RoundT
 
 	// Curry the observer with dynamic labels before checking the remaining labels.
 	code, method := checkLabels(obs.MustCurryWith(rtOpts.emptyDynamicLabels()))
+	hasExtraLabels := len(rtOpts.extraLabelsFromCtx) > 0
 
 	return func(r *http.Request) (*http.Response, error) {
 		start := time.Now()
 		resp, err := next.RoundTrip(r)
 		if err == nil {
-			l := labels(code, method, r.Method, resp.StatusCode, rtOpts.extraMethods...)
+			l := labels(code, method, hasExtraLabels, r.Method, resp.StatusCode, rtOpts.extraMethods...)
 			for label, resolve := range rtOpts.extraLabelsFromCtx {
 				l[label] = resolve(resp.Request.Context())
 			}
diff --git a/prometheus/promhttp/instrument_server.go b/prometheus/promhttp/instrument_server.go
index 3793036ad..f941ff77e 100644
--- a/prometheus/promhttp/instrument_server.go
+++ b/prometheus/promhttp/instrument_server.go
@@ -89,6 +89,7 @@ func InstrumentHandlerDuration(obs prometheus.ObserverVec, next http.Handler, op
 
 	// Curry the observer with dynamic labels before checking the remaining labels.
 	code, method := checkLabels(obs.MustCurryWith(hOpts.emptyDynamicLabels()))
+	hasExtraLabels := len(hOpts.extraLabelsFromCtx) > 0
 
 	if code {
 		return func(w http.ResponseWriter, r *http.Request) {
@@ -96,7 +97,7 @@ func InstrumentHandlerDuration(obs prometheus.ObserverVec, next http.Handler, op
 			d := newDelegator(w, nil)
 			next.ServeHTTP(d, r)
 
-			l := labels(code, method, r.Method, d.Status(), hOpts.extraMethods...)
+			l := labels(code, method, hasExtraLabels, r.Method, d.Status(), hOpts.extraMethods...)
 			for label, resolve := range hOpts.extraLabelsFromCtx {
 				l[label] = resolve(r.Context())
 			}
@@ -107,7 +108,7 @@ func InstrumentHandlerDuration(obs prometheus.ObserverVec, next http.Handler, op
 	return func(w http.ResponseWriter, r *http.Request) {
 		now := time.Now()
 		next.ServeHTTP(w, r)
-		l := labels(code, method, r.Method, 0, hOpts.extraMethods...)
+		l := labels(code, method, hasExtraLabels, r.Method, 0, hOpts.extraMethods...)
 		for label, resolve := range hOpts.extraLabelsFromCtx {
 			l[label] = resolve(r.Context())
 		}
@@ -140,13 +141,14 @@ func InstrumentHandlerCounter(counter *prometheus.CounterVec, next http.Handler,
 
 	// Curry the counter with dynamic labels before checking the remaining labels.
 	code, method := checkLabels(counter.MustCurryWith(hOpts.emptyDynamicLabels()))
+	hasExtraLabels := len(hOpts.extraLabelsFromCtx) > 0
 
 	if code {
 		return func(w http.ResponseWriter, r *http.Request) {
 			d := newDelegator(w, nil)
 			next.ServeHTTP(d, r)
 
-			l := labels(code, method, r.Method, d.Status(), hOpts.extraMethods...)
+			l := labels(code, method, hasExtraLabels, r.Method, d.Status(), hOpts.extraMethods...)
 			for label, resolve := range hOpts.extraLabelsFromCtx {
 				l[label] = resolve(r.Context())
 			}
@@ -157,7 +159,7 @@ func InstrumentHandlerCounter(counter *prometheus.CounterVec, next http.Handler,
 	return func(w http.ResponseWriter, r *http.Request) {
 		next.ServeHTTP(w, r)
 
-		l := labels(code, method, r.Method, 0, hOpts.extraMethods...)
+		l := labels(code, method, hasExtraLabels, r.Method, 0, hOpts.extraMethods...)
 		for label, resolve := range hOpts.extraLabelsFromCtx {
 			l[label] = resolve(r.Context())
 		}
@@ -195,11 +197,12 @@ func InstrumentHandlerTimeToWriteHeader(obs prometheus.ObserverVec, next http.Ha
 
 	// Curry the observer with dynamic labels before checking the remaining labels.
 	code, method := checkLabels(obs.MustCurryWith(hOpts.emptyDynamicLabels()))
+	hasExtraLabels := len(hOpts.extraLabelsFromCtx) > 0
 
 	return func(w http.ResponseWriter, r *http.Request) {
 		now := time.Now()
 		d := newDelegator(w, func(status int) {
-			l := labels(code, method, r.Method, status, hOpts.extraMethods...)
+			l := labels(code, method, hasExtraLabels, r.Method, status, hOpts.extraMethods...)
 			for label, resolve := range hOpts.extraLabelsFromCtx {
 				l[label] = resolve(r.Context())
 			}
@@ -236,6 +239,7 @@ func InstrumentHandlerRequestSize(obs prometheus.ObserverVec, next http.Handler,
 
 	// Curry the observer with dynamic labels before checking the remaining labels.
 	code, method := checkLabels(obs.MustCurryWith(hOpts.emptyDynamicLabels()))
+	hasExtraLabels := len(hOpts.extraLabelsFromCtx) > 0
 
 	if code {
 		return func(w http.ResponseWriter, r *http.Request) {
@@ -243,7 +247,7 @@ func InstrumentHandlerRequestSize(obs prometheus.ObserverVec, next http.Handler,
 			next.ServeHTTP(d, r)
 			size := computeApproximateRequestSize(r)
 
-			l := labels(code, method, r.Method, d.Status(), hOpts.extraMethods...)
+			l := labels(code, method, hasExtraLabels, r.Method, d.Status(), hOpts.extraMethods...)
 			for label, resolve := range hOpts.extraLabelsFromCtx {
 				l[label] = resolve(r.Context())
 			}
@@ -255,7 +259,7 @@ func InstrumentHandlerRequestSize(obs prometheus.ObserverVec, next http.Handler,
 		next.ServeHTTP(w, r)
 		size := computeApproximateRequestSize(r)
 
-		l := labels(code, method, r.Method, 0, hOpts.extraMethods...)
+		l := labels(code, method, hasExtraLabels, r.Method, 0, hOpts.extraMethods...)
 		for label, resolve := range hOpts.extraLabelsFromCtx {
 			l[label] = resolve(r.Context())
 		}
@@ -290,12 +294,13 @@ func InstrumentHandlerResponseSize(obs prometheus.ObserverVec, next http.Handler
 
 	// Curry the observer with dynamic labels before checking the remaining labels.
 	code, method := checkLabels(obs.MustCurryWith(hOpts.emptyDynamicLabels()))
+	hasExtraLabels := len(hOpts.extraLabelsFromCtx) > 0
 
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		d := newDelegator(w, nil)
 		next.ServeHTTP(d, r)
 
-		l := labels(code, method, r.Method, d.Status(), hOpts.extraMethods...)
+		l := labels(code, method, hasExtraLabels, r.Method, d.Status(), hOpts.extraMethods...)
 		for label, resolve := range hOpts.extraLabelsFromCtx {
 			l[label] = resolve(r.Context())
 		}
@@ -393,8 +398,11 @@ func isLabelCurried(c prometheus.Collector, label string) bool {
 // unnecessary allocations on each request.
 var emptyLabels = prometheus.Labels{}
 
-func labels(code, method bool, reqMethod string, status int, extraMethods ...string) prometheus.Labels {
+func labels(code, method, hasExtraLabelsCtx bool, reqMethod string, status int, extraMethods ...string) prometheus.Labels {
 	if !(code || method) {
+		if hasExtraLabelsCtx {
+			return prometheus.Labels{}
+		}
 		return emptyLabels
 	}
 	labels := prometheus.Labels{}
diff --git a/prometheus/promhttp/instrument_server_test.go b/prometheus/promhttp/instrument_server_test.go
index 6c644432c..0cdc29cd4 100644
--- a/prometheus/promhttp/instrument_server_test.go
+++ b/prometheus/promhttp/instrument_server_test.go
@@ -346,7 +346,7 @@ func TestLabels(t *testing.T) {
 		t.Run(name, func(t *testing.T) {
 			if sc.ok {
 				gotCode, gotMethod := checkLabels(sc.varLabels)
-				gotLabels := labels(gotCode, gotMethod, sc.reqMethod, sc.respStatus, sc.extraMethods...)
+				gotLabels := labels(gotCode, gotMethod, false, sc.reqMethod, sc.respStatus, sc.extraMethods...)
 				if !equalLabels(gotLabels, sc.wantLabels) {
 					t.Errorf("wanted labels=%v for counter, got code=%v", sc.wantLabels, gotLabels)
 				}