diff --git a/src/components/views/settings/DevicesPanel.js b/src/components/views/settings/DevicesPanel.js
index 8dd6bb9230..2914b0789d 100644
--- a/src/components/views/settings/DevicesPanel.js
+++ b/src/components/views/settings/DevicesPanel.js
@@ -52,7 +52,7 @@ export default class DevicesPanel extends React.Component {
             (error) => {
                 if (this._unmounted) { return; }
                 var errtxt;
-                if (err.httpStatus == 404) {
+                if (error.httpStatus == 404) {
                     // 404 probably means the HS doesn't yet support the API.
                     errtxt = "Your home server does not support device management.";
                 } else {
@@ -127,6 +127,7 @@ export default class DevicesPanel extends React.Component {
         return (
             <div className={classes}>
                 <div className="mx_DevicesPanel_header">
+                    <div className="mx_DevicesPanel_deviceId">ID</div>
                     <div className="mx_DevicesPanel_deviceName">Name</div>
                     <div className="mx_DevicesPanel_deviceLastSeen">Last seen</div>
                     <div className="mx_DevicesPanel_deviceButtons"></div>
diff --git a/src/components/views/settings/DevicesPanelEntry.js b/src/components/views/settings/DevicesPanelEntry.js
index b660f196c8..cc416ace2f 100644
--- a/src/components/views/settings/DevicesPanelEntry.js
+++ b/src/components/views/settings/DevicesPanelEntry.js
@@ -109,6 +109,9 @@ export default class DevicesPanelEntry extends React.Component {
 
         return (
             <div className="mx_DevicesPanel_device">
+                <div className="mx_DevicesPanel_deviceId">
+                    {device.device_id}
+                </div>
                 <div className="mx_DevicesPanel_deviceName">
                     <EditableTextContainer initialValue={device.display_name}
                         onSubmit={this._onDisplayNameChanged}