diff --git a/src/components/views/avatars/MemberAvatar.tsx b/src/components/views/avatars/MemberAvatar.tsx
index 4ca2fb8ac8..e00b9b4b85 100644
--- a/src/components/views/avatars/MemberAvatar.tsx
+++ b/src/components/views/avatars/MemberAvatar.tsx
@@ -108,7 +108,8 @@ export default class MemberAvatar extends React.PureComponent<IProps, IState> {
     }
 
     render() {
-        let { member, fallbackUserId, onClick, viewUserOnClick, ...otherProps } = this.props;
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        let { member, fallbackUserId, onClick, viewUserOnClick, forceHistorical, ...otherProps } = this.props;
         const userId = member ? member.userId : fallbackUserId;
 
         if (viewUserOnClick) {
@@ -122,7 +123,8 @@ export default class MemberAvatar extends React.PureComponent<IProps, IState> {
         }
 
         return (
-            <BaseAvatar {...otherProps}
+            <BaseAvatar
+                {...otherProps}
                 name={this.state.name}
                 title={this.state.title}
                 idName={userId}
diff --git a/src/components/views/settings/CryptographyPanel.tsx b/src/components/views/settings/CryptographyPanel.tsx
index 353645fd05..365c24ab40 100644
--- a/src/components/views/settings/CryptographyPanel.tsx
+++ b/src/components/views/settings/CryptographyPanel.tsx
@@ -75,14 +75,16 @@ export default class CryptographyPanel extends React.Component<IProps, IState> {
             <div className='mx_SettingsTab_section mx_CryptographyPanel'>
                 <span className='mx_SettingsTab_subheading'>{ _t("Cryptography") }</span>
                 <table className='mx_SettingsTab_subsectionText mx_CryptographyPanel_sessionInfo'>
-                    <tr>
-                        <td>{ _t("Session ID:") }</td>
-                        <td><code>{ deviceId }</code></td>
-                    </tr>
-                    <tr>
-                        <td>{ _t("Session key:") }</td>
-                        <td><code><b>{ identityKey }</b></code></td>
-                    </tr>
+                    <tbody>
+                        <tr>
+                            <td>{ _t("Session ID:") }</td>
+                            <td><code>{ deviceId }</code></td>
+                        </tr>
+                        <tr>
+                            <td>{ _t("Session key:") }</td>
+                            <td><code><b>{ identityKey }</b></code></td>
+                        </tr>
+                    </tbody>
                 </table>
                 { importExportButtons }
                 { noSendUnverifiedSetting }