diff --git a/pkg/services/pluginsintegration/clientmiddleware/metrics_middleware.go b/pkg/services/pluginsintegration/clientmiddleware/metrics_middleware.go
index a75f7a43889..d38ce28724f 100644
--- a/pkg/services/pluginsintegration/clientmiddleware/metrics_middleware.go
+++ b/pkg/services/pluginsintegration/clientmiddleware/metrics_middleware.go
@@ -75,10 +75,13 @@ func newMetricsMiddleware(promRegisterer prometheus.Registerer, pluginRegistry r
 
 // NewMetricsMiddleware returns a new MetricsMiddleware.
 func NewMetricsMiddleware(promRegisterer prometheus.Registerer, pluginRegistry registry.Service) backend.HandlerMiddleware {
-	imw := newMetricsMiddleware(promRegisterer, pluginRegistry)
+	metrics := newMetricsMiddleware(promRegisterer, pluginRegistry)
 	return backend.HandlerMiddlewareFunc(func(next backend.Handler) backend.Handler {
-		imw.BaseHandler = backend.NewBaseHandler(next)
-		return imw
+		return &MetricsMiddleware{
+			BaseHandler:    backend.NewBaseHandler(next),
+			pluginMetrics:  metrics.pluginMetrics,
+			pluginRegistry: metrics.pluginRegistry,
+		}
 	})
 }