diff --git a/internal/cloudapi/v2/server.go b/internal/cloudapi/v2/server.go
index 06a1da24e..30ae4e542 100644
--- a/internal/cloudapi/v2/server.go
+++ b/internal/cloudapi/v2/server.go
@@ -93,12 +93,13 @@ func (s *Server) Handler(path string) http.Handler {
 
 	mws := []echo.MiddlewareFunc{
 		prometheus.StatusMiddleware(prometheus.ComposerSubsystem),
-		prometheus.HTTPDurationMiddleware(prometheus.ComposerSubsystem),
 	}
 	if s.config.JWTEnabled {
 		mws = append(mws, auth.TenantChannelMiddleware(s.config.TenantProviderFields, HTTPError(ErrorTenantNotFound)))
 	}
-	mws = append(mws, prometheus.MetricsMiddleware, s.ValidateRequest)
+	mws = append(mws,
+		prometheus.HTTPDurationMiddleware(prometheus.ComposerSubsystem),
+		prometheus.MetricsMiddleware, s.ValidateRequest)
 	RegisterHandlers(e.Group(path, mws...), &handler)
 
 	return e