diff --git a/modules/monitoring/application/views/helpers/PluginOutput.php b/modules/monitoring/application/views/helpers/PluginOutput.php
index 12a9b6e97..6585ae913 100644
--- a/modules/monitoring/application/views/helpers/PluginOutput.php
+++ b/modules/monitoring/application/views/helpers/PluginOutput.php
@@ -27,7 +27,7 @@ class Zend_View_Helper_PluginOutput extends Zend_View_Helper_Abstract
         '@@@@@@',
     );
 
-    public function pluginOutput($output, $raw = false)
+    public function pluginOutput($output)
     {
         if (empty($output)) {
             return '';
@@ -48,11 +48,7 @@ class Zend_View_Helper_PluginOutput extends Zend_View_Helper_Abstract
                 $this->view->escape($output)
             );
         }
-        if (! $raw) {
-            $output = '<pre class="pluginoutput">' . $output . '</pre>';
-        }
-        $output = $this->fixLinks($output);
-        return $output;
+        return '<pre class="pluginoutput">' . $this->fixLinks($output) . '</pre>';
     }
 
     protected function fixLinks($html)
diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml
index b697c8f6a..0d033eaad 100644
--- a/modules/monitoring/application/views/scripts/list/hosts.phtml
+++ b/modules/monitoring/application/views/scripts/list/hosts.phtml
@@ -90,7 +90,7 @@ if (count($hosts) === 0) {
           )
         ) ?>)</span>
         <?php endif ?>
-        <p class="pluginoutput"><?= $this->pluginOutput($this->ellipsis($host->host_output, 10000), true) ?></p>
+        <p class="pluginoutput"><?= $this->escape($this->ellipsis($host->host_output, 10000)) ?></p>
       </td>
       <?php foreach($this->addColumns as $col): ?>
       <td><?= $this->escape($host->$col) ?></td>
diff --git a/modules/monitoring/application/views/scripts/list/notifications.phtml b/modules/monitoring/application/views/scripts/list/notifications.phtml
index 06a9e80a0..f94266210 100644
--- a/modules/monitoring/application/views/scripts/list/notifications.phtml
+++ b/modules/monitoring/application/views/scripts/list/notifications.phtml
@@ -48,7 +48,7 @@ if (count($notifications) === 0) {
                     <?= $this->link()->host($notification->host_name, $notification->host_display_name) ?>
                 <?php endif ?>
                 <br>
-                <?= $this->pluginOutput($this->ellipsis($notification->notification_output, 10000), true) ?>
+                <?= $this->escape($this->ellipsis($notification->notification_output, 10000)) ?>
                 <br>
                 <?php if (! $this->contact): ?>
                     <small>
diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml
index 887757537..15f702d10 100644
--- a/modules/monitoring/application/views/scripts/list/services.phtml
+++ b/modules/monitoring/application/views/scripts/list/services.phtml
@@ -82,7 +82,7 @@ if (count($services) === 0) {
     )
 ) ?><br />
         <div class="sparkline-box"><?= $this->perfdata($service->service_perfdata, true, 5) ?> </div>
-        <p class="pluginoutput"><?= $this->pluginOutput($this->ellipsis($service->service_output, 10000), true) ?></p>
+        <p class="pluginoutput"><?= $this->escape($this->ellipsis($service->service_output, 10000)) ?></p>
       </td>
 <?php foreach($this->addColumns as $col): ?>
       <td><?= $this->escape($service->$col) ?></td>