diff --git a/mod/lti/service.php b/mod/lti/service.php
index 7202289cec6..f117087ebc7 100644
--- a/mod/lti/service.php
+++ b/mod/lti/service.php
@@ -174,17 +174,18 @@ switch ($messagetype) {
         $data = new stdClass();
         $data->body = $rawbody;
         $data->xml = $xml;
+        $data->messageid = lti_parse_message_id($xml);
         $data->messagetype = $messagetype;
         $data->consumerkey = $consumerkey;
         $data->sharedsecret = $sharedsecret;
         $eventdata = array();
         $eventdata['other'] = array();
-        $eventdata['other']['messageid'] = lti_parse_message_id($xml);
+        $eventdata['other']['messageid'] = $data->messageid;
         $eventdata['other']['messagetype'] = $messagetype;
         $eventdata['other']['consumerkey'] = $consumerkey;
 
         // Before firing the event, allow subplugins a chance to handle.
-        if (lti_extend_lti_services((object) $eventdata['other'])) {
+        if (lti_extend_lti_services($data)) {
             break;
         }