diff --git a/modules/monitoring/application/views/scripts/service/history.phtml b/modules/monitoring/application/views/scripts/service/history.phtml
index ac443c370..98e9bb408 100644
--- a/modules/monitoring/application/views/scripts/service/history.phtml
+++ b/modules/monitoring/application/views/scripts/service/history.phtml
@@ -1,6 +1,19 @@
 <?php
 use Icinga\Module\Monitoring\Object\Service;
 
+function contactsLink($match, $view) {
+    $links = array();
+    foreach (preg_split('/,\s/', $match[1]) as $contact) {
+        $links[] = $view->qlink(
+            $contact,
+            'monitoring/show/contact',
+            array('contact_name' => $contact),
+            array('title' => sprintf($view->translate('Show detailed information about %s'), $contact))
+        );
+    }
+    return '[' . implode(', ', $links) . ']';
+}
+
 $self = $this;
 
 if (! $this->compact): ?>
@@ -15,29 +28,6 @@ if (! $this->compact): ?>
 </div>
 <?php endif ?>
 <div class="content">
-<?php
-
-if (count($history) === 0) {
-    echo $this->translate('No history events found matching the filter') . '</div>';
-    return;
-}
-?>
-
-<?php
-function contactsLink($match, $view) {
-    $links = array();
-    foreach (preg_split('/,\s/', $match[1]) as $contact) {
-        $links[] = $view->qlink(
-            $contact,
-            'monitoring/show/contact',
-            array('contact_name' => $contact),
-            array('title' => sprintf($view->translate('Show detailed information about %s'), $contact))
-        );
-    }
-    return '[' . implode(', ', $links) . ']';
-}
-?>
-
   <table data-base-target="_next" class="action objecthistory">
     <tbody>
     <?php foreach ($history as $event): ?>
@@ -134,7 +124,10 @@ $output = $this->tickets ? preg_replace_callback(
           </div>
         </td>
       </tr>
-<?php endforeach; ?>
+    <?php endforeach; ?>
     </tbody>
   </table>
+<?php if (! $history->hasResult()): ?>
+  <?= $this->translate('No history events found matching the filter'); ?>
+<?php endif ?>
 </div>
\ No newline at end of file