diff --git a/lib/LMSManagers/LMSHelpdeskManager.php b/lib/LMSManagers/LMSHelpdeskManager.php
index d1d6139824..23f9c640cb 100644
--- a/lib/LMSManagers/LMSHelpdeskManager.php
+++ b/lib/LMSManagers/LMSHelpdeskManager.php
@@ -760,30 +760,22 @@ public function GetQueueNameByTicketId($id)
 
     public function GetEventsByTicketId($id)
     {
-        $events = $this->db->GetAll('SELECT events.id as id, title, description, note, date, begintime, endtime, '
-                . 'userid, customerid, private, closed, closeddate, closeduserid, events.type, ticketid, va.location, '
-                . $this->db->Concat('customers.lastname', "' '", 'customers.name').' AS customername, '
-                . $this->db->Concat('users.firstname', "' '", 'users.lastname').' AS username, '
-                . $this->db->Concat('u.firstname', "' '", 'u.lastname').' AS closedusername, vn.name AS node_name, '
-                . $this->db->Concat('c.city', "', '", 'c.address') . ' AS customerlocation, vn.location AS node_location '
-                . 'FROM events '
-                . 'LEFT JOIN customers ON (customerid = customers.id) '
-                . 'LEFT JOIN users ON (userid = users.id) '
-                . 'LEFT JOIN users u ON (closeduserid = u.id) '
-                . 'LEFT JOIN vaddresses va ON va.id = events.address_id '
-                . 'LEFT JOIN vnodes as vn ON (nodeid = vn.id) '
-                . 'LEFT JOIN customerview c ON (events.customerid = c.id) '
-                . 'WHERE ticketid = ? ORDER BY events.id ASC', array($id));
-
-        if (is_array($events)) {
+        global $LMS;
+        $events = $this->db->GetAll(
+            'SELECT id FROM events WHERE ticketid = ? ORDER BY id ASC',
+            array($id)
+        );
+
+        if (!empty($events)) {
             foreach ($events as $idx => $row) {
-                $events[$idx]['userlist'] = $this->db->GetAll("SELECT vu.name,userid AS ul FROM eventassignments AS e LEFT JOIN vusers vu ON vu.id = e.userid WHERE eventid = $row[id]");
+                $events[$idx] = $LMS->GetEvent($row);
             }
         }
 
         return $events;
     }
 
+
     public function GetQueueName($id)
     {
         return $this->db->GetOne('SELECT name FROM rtqueues WHERE id=?', array($id));