diff --git a/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml b/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
index d47bd59e37..95e595ac10 100644
--- a/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
@@ -1,20 +1,14 @@
 <?php
 use Icinga\Module\Monitoring\Object\Host;
-?>
 
-<?php
 $i = 0;
-$hidden = array();
-$hiddenRich = array();
 ?>
 
-<div class="hbox-item">
-    <?= $this->translate('States:') ?>
-    &nbsp;<?= $hostStatesPieChart; ?>
-</div>
-
 <?php if (($hostCount = count($objects)) > 0): ?>
-
+    <div class="hbox-item">
+        <?= $this->translate('States:') ?>
+        &nbsp;<?= $hostStatesPieChart; ?>
+    </div>
 <p>
     <table class="state statesummary">
 
diff --git a/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml b/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
index e80fe2c0b3..e0b330ece5 100644
--- a/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
@@ -1,22 +1,17 @@
 <?php
 use Icinga\Module\Monitoring\Object\Service;
-?>
-
-<div class="hbox-item">
-    <?= $this->translate('Service states:') ?>
-    &nbsp;<?= $serviceStatesPieChart; ?>
-</div>
-<div class="hbox-item">
-    <?= $this->translate('Host states:') ?>
-    &nbsp;<?= $hostStatesPieChart; ?>
-</div>
 
-<?php
-    $i = 0;
-    $hidden = array();
-    $hiddenRich = array();
+$i = 0;
 ?>
 <?php if (($serviceCount = count($objects)) > 0): ?>
+    <div class="hbox-item">
+        <?= $this->translate('Service states:') ?>
+        &nbsp;<?= $serviceStatesPieChart; ?>
+    </div>
+    <div class="hbox-item">
+        <?= $this->translate('Host states:') ?>
+        &nbsp;<?= $hostStatesPieChart; ?>
+    </div>
     <p>
     <table class="state statesummary">
     <tbody>