diff --git a/scripts/dashboards_render_atlas.py b/scripts/dashboards_render_atlas.py
index bf3e5701..13d7b269 100644
--- a/scripts/dashboards_render_atlas.py
+++ b/scripts/dashboards_render_atlas.py
@@ -3065,12 +3065,14 @@ def build_jobs_dashboard():
         )
         return f'({core}) or on(suite) (0 * ({suite_universe}))'
 
-    problematic_tests_history = (
+    problematic_tests_history_core = (
         f'topk(12, sum by (suite, test) (increase(platform_quality_gate_test_case_result{{suite=~"{suite_var}",status="failed",{exported}}}[$__interval])))'
     )
-    worst_test_per_suite = (
+    problematic_tests_history = f"({problematic_tests_history_core}) or on() vector(0)"
+    worst_test_per_suite_core = (
         f'topk by (suite) (1, sum by (suite, test) (increase(platform_quality_gate_test_case_result{{suite=~"{suite_var}",status="failed",{exported}}}[30d])))'
     )
+    worst_test_per_suite = f"({worst_test_per_suite_core}) or on() vector(0)"
     selected_test_pass_fail = [
         {
             "refId": "A",
diff --git a/services/monitoring/dashboards/atlas-jobs.json b/services/monitoring/dashboards/atlas-jobs.json
index 5511144c..cbe87be2 100644
--- a/services/monitoring/dashboards/atlas-jobs.json
+++ b/services/monitoring/dashboards/atlas-jobs.json
@@ -2060,7 +2060,7 @@
       },
       "targets": [
         {
-          "expr": "topk(12, sum by (suite, test) (increase(platform_quality_gate_test_case_result{suite=~\"${suite:regex}\",status=\"failed\",exported_job=\"platform-quality-ci\"}[$__interval])))",
+          "expr": "(topk(12, sum by (suite, test) (increase(platform_quality_gate_test_case_result{suite=~\"${suite:regex}\",status=\"failed\",exported_job=\"platform-quality-ci\"}[$__interval])))) or on() vector(0)",
           "refId": "A",
           "legendFormat": "{{suite}} \u00b7 {{test}}"
         }
@@ -2153,7 +2153,7 @@
       },
       "targets": [
         {
-          "expr": "sort_desc(topk by (suite) (1, sum by (suite, test) (increase(platform_quality_gate_test_case_result{suite=~\"${suite:regex}\",status=\"failed\",exported_job=\"platform-quality-ci\"}[30d]))))",
+          "expr": "sort_desc((topk by (suite) (1, sum by (suite, test) (increase(platform_quality_gate_test_case_result{suite=~\"${suite:regex}\",status=\"failed\",exported_job=\"platform-quality-ci\"}[30d])))) or on() vector(0))",
           "refId": "A",
           "legendFormat": "{{suite}} \u00b7 {{test}}",
           "instant": true
diff --git a/services/monitoring/grafana-dashboard-jobs.yaml b/services/monitoring/grafana-dashboard-jobs.yaml
index b1d73b9d..3bf3aefc 100644
--- a/services/monitoring/grafana-dashboard-jobs.yaml
+++ b/services/monitoring/grafana-dashboard-jobs.yaml
@@ -2069,7 +2069,7 @@ data:
           },
           "targets": [
             {
-              "expr": "topk(12, sum by (suite, test) (increase(platform_quality_gate_test_case_result{suite=~\"${suite:regex}\",status=\"failed\",exported_job=\"platform-quality-ci\"}[$__interval])))",
+              "expr": "(topk(12, sum by (suite, test) (increase(platform_quality_gate_test_case_result{suite=~\"${suite:regex}\",status=\"failed\",exported_job=\"platform-quality-ci\"}[$__interval])))) or on() vector(0)",
               "refId": "A",
               "legendFormat": "{{suite}} \u00b7 {{test}}"
             }
@@ -2162,7 +2162,7 @@ data:
           },
           "targets": [
             {
-              "expr": "sort_desc(topk by (suite) (1, sum by (suite, test) (increase(platform_quality_gate_test_case_result{suite=~\"${suite:regex}\",status=\"failed\",exported_job=\"platform-quality-ci\"}[30d]))))",
+              "expr": "sort_desc((topk by (suite) (1, sum by (suite, test) (increase(platform_quality_gate_test_case_result{suite=~\"${suite:regex}\",status=\"failed\",exported_job=\"platform-quality-ci\"}[30d])))) or on() vector(0))",
               "refId": "A",
               "legendFormat": "{{suite}} \u00b7 {{test}}",
               "instant": true