diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 71325e05a..cd0a734ef 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -623,9 +623,7 @@ class Monitoring_ListController extends Controller
             'attempt',
             'max_attempts',
             'output',
-            'type',
-            'host',
-            'service'
+            'type'
         ));
 
         $this->filterQuery($query);
diff --git a/modules/monitoring/application/views/scripts/list/eventhistory.phtml b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
index 0b6b9bcec..3e2ad32c8 100644
--- a/modules/monitoring/application/views/scripts/list/eventhistory.phtml
+++ b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
@@ -34,7 +34,7 @@ use Icinga\Module\Monitoring\Object\Service;
       $icon = 'help';
       $title = $event->type;
       $stateName = 'invalid';
-      $isService = isset($event->service);
+      $isService = isset($event->service_description);
       switch ($event->type) {
         case 'notify':
           $icon = 'bell';
@@ -99,10 +99,10 @@ use Icinga\Module\Monitoring\Object\Service;
         <td>
         <?php if ($isService): ?>
           <?= $this->link()->service(
-              $event->service, $event->service_display_name, $event->host, $event->host_display_name
+              $event->service_description, $event->service_display_name, $event->host_name, $event->host_display_name
           ) ?>
         <?php else: ?>
-          <?= $this->link()->host($event->host, $event->host_display_name) ?>
+          <?= $this->link()->host($event->host_name, $event->host_display_name) ?>
         <?php endif ?>
           <br>
           <div>