diff --git a/dojo/templates/dojo/metrics.html b/dojo/templates/dojo/metrics.html
index 2c7ab40fbf6..b35c7bb24ee 100644
--- a/dojo/templates/dojo/metrics.html
+++ b/dojo/templates/dojo/metrics.html
@@ -360,7 +360,7 @@ <h3 id="accepted-per-month-title">{% trans "Risk accepted bug count by month" %}
                         <!-- /.panel -->
                     </div>
                 {% endif %}
-                {% if not critical_prods %}
+                {% if not critical_prods and name != labels.ASSET_METRICS_CRITICAL_LABEL %}
                     <div class="col-lg-12">
                         <div class="panel panel-default">
                             <div class="panel-heading">
@@ -943,7 +943,7 @@ <h4>{% trans "Closed in Period" %}</h4>
                 medium1.push([{{ week.epoch }}, {{ week.medium }}]);
                 low1.push([{{ week.epoch }}, {{ week.low }}]);
             {% endfor %}
-            {% if not critical_prods %}
+            {% if not critical_prods and name != labels.ASSET_METRICS_CRITICAL_LABEL %}
                 opened_per_week_2(critical, high, medium, low);
                 accepted_per_week_2(critical1, high1, medium1, low1);
             {% endif %}
diff --git a/dojo/templates_classic/dojo/metrics.html b/dojo/templates_classic/dojo/metrics.html
index 777467e0e59..881abbef4cb 100644
--- a/dojo/templates_classic/dojo/metrics.html
+++ b/dojo/templates_classic/dojo/metrics.html
@@ -368,7 +368,7 @@ <h3 id="accepted-per-month-title">{% trans "Risk accepted bug count by month" %}
                         <!-- /.panel -->
                     </div>
                 {% endif %}
-                {% if not critical_prods %}
+                {% if not critical_prods and name != labels.ASSET_METRICS_CRITICAL_LABEL %}
                     <div class="col-lg-12">
                         <div class="panel panel-default">
                             <div class="panel-heading">
@@ -958,7 +958,7 @@ <h4>{% trans "Closed in Period" %}</h4>
                 medium1.push([{{ week.epoch }}, {{ week.medium }}]);
                 low1.push([{{ week.epoch }}, {{ week.low }}]);
             {% endfor %}
-            {% if not critical_prods %}
+            {% if not critical_prods and name != labels.ASSET_METRICS_CRITICAL_LABEL %}
                 opened_per_week_2(critical, high, medium, low);
                 accepted_per_week_2(critical1, high1, medium1, low1);
             {% endif %}
diff --git a/tests/check_various_pages.py b/tests/check_various_pages.py
index aa1188253cc..d03ec3e0cd5 100644
--- a/tests/check_various_pages.py
+++ b/tests/check_various_pages.py
@@ -10,6 +10,10 @@ def test_user_status(self):
         driver = self.driver
         driver.get(self.base_url + "user")
 
+    def test_critical_asset_metrics_status(self):
+        driver = self.driver
+        driver.get(self.base_url + "critical_asset_metrics")
+
     def test_calendar_status(self):
         driver = self.driver
         driver.get(self.base_url + "calendar")
@@ -42,6 +46,7 @@ def suite():
     suite = unittest.TestSuite()
     suite.addTest(BaseTestCase("test_login"))
     suite.addTest(VariousPagesTest("test_user_status"))
+    suite.addTest(VariousPagesTest("test_critical_asset_metrics_status"))
     suite.addTest(VariousPagesTest("test_calendar_status"))
     suite.addTest(VariousPagesTest("test_finding_group_open_status"))
     suite.addTest(VariousPagesTest("test_finding_group_all_status"))