diff --git a/modules/monitoring/application/views/scripts/partials/comment/comment-detail.phtml b/modules/monitoring/application/views/scripts/partials/comment/comment-detail.phtml
index 5a250d213..695c71901 100644
--- a/modules/monitoring/application/views/scripts/partials/comment/comment-detail.phtml
+++ b/modules/monitoring/application/views/scripts/partials/comment/comment-detail.phtml
@@ -1,7 +1,7 @@
 <span class="comment-header">
 <?php if ($comment->objecttype === 'service'): ?>
     <?= $this->icon('service', $this->translate('Service')) ?> <?= $this->qlink(
-        $this->escape($comment->host_display_name) . ': ' . $this->escape($comment->service_display_name),
+        $comment->host_display_name . ': ' . $comment->service_display_name,
         'monitoring/service/show',
         array(
             'host'    => $comment->host_name,
@@ -17,7 +17,7 @@
     ) ?>
 <?php else: ?>
     <?= $this->icon('host', $this->translate('Host')) ?> <?= $this->qlink(
-        $this->escape($comment->host_display_name),
+        $comment->host_display_name,
         'monitoring/host/show',
         array('host' => $comment->host_name),
         array(
diff --git a/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml b/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml
index 637557058..9c7f7af19 100644
--- a/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml
@@ -11,7 +11,7 @@
   <span class="comment-header">
     <?php if ($isService): ?>
         <?= $this->icon('service', $this->translate('Service')); ?> <?= $this->qlink(
-            $this->escape($downtime->host_display_name) . ': ' . $this->escape($downtime->service_display_name),
+            $downtime->host_display_name . ': ' . $downtime->service_display_name,
             'monitoring/service/show',
             array(
                 'host'    => $downtime->host_name,
@@ -27,7 +27,7 @@
         ); ?>
     <?php else: ?>
         <?= $this->icon('host', $this->translate('host')); ?> <?= $this->qlink(
-            $this->escape($downtime->host_display_name),
+            $downtime->host_display_name,
             'monitoring/host/show',
             array('host' => $downtime->host_name, 'downtime_id' => $downtime->id),
             array(