1 files changed, 9 insertions, 8 deletions
diff --git a/lib/gitlab/prometheus/queries/additional_metrics_deployment_query.rb b/lib/gitlab/prometheus/queries/additional_metrics_deployment_query.rb
index cfe6bed188b..67c69d9ccf3 100644
--- a/lib/gitlab/prometheus/queries/additional_metrics_deployment_query.rb
+++ b/lib/gitlab/prometheus/queries/additional_metrics_deployment_query.rb
@@ -5,15 +5,16 @@ module Gitlab
         include QueryAdditionalMetrics
 
         def query(deployment_id)
-          deployment = Deployment.find_by(id: deployment_id)
-          query_context = {
-            environment_slug: deployment.environment.slug,
-            environment_filter: %{container_name!="POD",environment="#{deployment.environment.slug}"},
-            timeframe_start: (deployment.created_at - 30.minutes).to_f,
-            timeframe_end: (deployment.created_at + 30.minutes).to_f
-          }
+          Deployment.find_by(id: deployment_id).try do |deployment|
+            query_context = {
+              environment_slug: deployment.environment.slug,
+              environment_filter: %{container_name!="POD",environment="#{deployment.environment.slug}"},
+              timeframe_start: (deployment.created_at - 30.minutes).to_f,
+              timeframe_end: (deployment.created_at + 30.minutes).to_f
+            }
 
-          query_metrics(query_context)
+            query_metrics(query_context)
+          end
         end
       end
     end