diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index e6f8de61a9..d35b0fce1f 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -576,7 +576,7 @@ export default class MessagePanel extends React.Component {
                 ref={this._collectEventNode.bind(this, eventId)}
                 data-scroll-tokens={scrollToken}
             >
-                <TileErrorBoundary>
+                <TileErrorBoundary mxEvent={mxEv}>
                     <EventTile mxEvent={mxEv}
                         continuation={continuation}
                         isRedacted={mxEv.isRedacted()}
diff --git a/src/components/views/messages/TileErrorBoundary.js b/src/components/views/messages/TileErrorBoundary.js
index 372d402899..a8e7b144f2 100644
--- a/src/components/views/messages/TileErrorBoundary.js
+++ b/src/components/views/messages/TileErrorBoundary.js
@@ -47,6 +47,7 @@ export default class TileErrorBoundary extends React.Component {
 
     render() {
         if (this.state.error) {
+            const { mxEvent } = this.props;
             const classes = {
                 mx_EventTile: true,
                 mx_EventTile_info: true,
@@ -57,6 +58,7 @@ export default class TileErrorBoundary extends React.Component {
                 <div className="mx_EventTile_line">
                     <span>
                         {_t("An error occurred while rendering this event.")}
+                        { mxEvent && ` [${mxEvent.getType()}]` }
                         <a onClick={this._onBugReport} href="#">
                             {_t("Submit debug logs")}
                         </a>