diff --git a/app/controllers/projects/environments_controller.rb b/app/controllers/projects/environments_controller.rb
index 1aa4ac6017ceeec79b4b3d7748ad84910c6fcf77..145b0a6cade9f82c60499fece177259e12dd53e6 100644
--- a/app/controllers/projects/environments_controller.rb
+++ b/app/controllers/projects/environments_controller.rb
@@ -158,22 +158,16 @@ class Projects::EnvironmentsController < Projects::ApplicationController
   end
 
   def metrics_dashboard
-    render_403 && return unless Feature.enabled?(:environment_metrics_use_prometheus_endpoint, project)
+    render_403 && return unless Feature.enabled?(:environment_metrics_use_prometheus_endpoint, @project)
 
     respond_to do |format|
       format.json do
         result = Gitlab::MetricsDashboard::Service.new(@project, @current_user, environment: environment).get_dashboard
 
-        if result[:status] == :success
-          status_code = :ok
-          details = { dashboard: result[:dashboard] }
-        else
-          status_code = result[:http_status] || :bad_request
-          details = { message: result[:message] }
-        end
+        ok_status = :ok if result[:status] == :success
+        status = ok_status || result[:http_status] || :bad_request
 
-        render status: status_code,
-               json: { status: result[:status] }.merge(details)
+        render status: status, json: result
       end
     end
   end