diff --git a/zabbix/datasource.js b/zabbix/datasource.js
index a5fc203..ca0008f 100644
--- a/zabbix/datasource.js
+++ b/zabbix/datasource.js
@@ -365,7 +365,8 @@ function (angular, _, dateMath) {
               time_from: from,
               time_till: to,
               objectids: _.keys(objects),
-              select_acknowledges: 'extend'
+              select_acknowledges: 'extend',
+              selectHosts: 'extend'
             };
 
             // Show problem events only
@@ -376,12 +377,19 @@ function (angular, _, dateMath) {
             return self.zabbixAPI.performZabbixAPIRequest('event.get', params)
               .then(function (result) {
                 var events = [];
+
+                var title ='';
+                if (options.annotation.showHostname) {
+                  title += e.hosts[0]['name'] + ': ';
+                }
+                title += Number(e.value) ? 'Problem' : 'OK';
+
                 _.each(result, function(e) {
                   var formatted_acknowledges = zabbixHelperSrv.formatAcknowledges(e.acknowledges);
                   events.push({
                     annotation: options.annotation,
                     time: e.clock * 1000,
-                    title: Number(e.value) ? 'Problem' : 'OK',
+                    title: title,
                     text: objects[e.objectid].description + formatted_acknowledges
                   });
                 });
diff --git a/zabbix/partials/annotations.editor.html b/zabbix/partials/annotations.editor.html
index 1a95b36..bc7fea0 100644
--- a/zabbix/partials/annotations.editor.html
+++ b/zabbix/partials/annotations.editor.html
@@ -32,5 +32,11 @@
     <label for="currentAnnotation.showOkEvents" class="cr1">Show OK events
       <tip>Show events, generated when trigger release to OK state</tip>
     </label>
+    <input type="checkbox" class="cr1" id="currentAnnotation.showHostname"
+           ng-model="currentAnnotation.showHostname"
+           ng-checked="currentAnnotation.showHostname">
+    <label for="currentAnnotation.showHostname" class="cr1">Show hostname
+      <tip>Show the hostname the event belongs to</tip>
+    </label>
   </div>
 </div>