diff --git a/src/components/views/avatars/BaseAvatar.tsx b/src/components/views/avatars/BaseAvatar.tsx
index 7f30a7a377..4c6fde19eb 100644
--- a/src/components/views/avatars/BaseAvatar.tsx
+++ b/src/components/views/avatars/BaseAvatar.tsx
@@ -134,7 +134,7 @@ const BaseAvatar = (props: IProps) => {
                 aria-hidden="true" />
         );
 
-        if (onClick !== null) {
+        if (onClick) {
             return (
                 <AccessibleButton
                     {...otherProps}
@@ -162,7 +162,7 @@ const BaseAvatar = (props: IProps) => {
         }
     }
 
-    if (onClick !== null) {
+    if (onClick) {
         return (
             <AccessibleButton
                 className={classNames("mx_BaseAvatar mx_BaseAvatar_image", className)}
@@ -196,4 +196,4 @@ const BaseAvatar = (props: IProps) => {
 };
 
 export default BaseAvatar;
-export type BaseAvatarType = React.FC<IProps>;
\ No newline at end of file
+export type BaseAvatarType = React.FC<IProps>;
diff --git a/test/components/views/messages/TextualBody-test.js b/test/components/views/messages/TextualBody-test.js
index 1f0749aff5..07cd51edbd 100644
--- a/test/components/views/messages/TextualBody-test.js
+++ b/test/components/views/messages/TextualBody-test.js
@@ -205,9 +205,8 @@ describe("<TextualBody />", () => {
             expect(content.html()).toBe('<span class="mx_EventTile_body markdown-body" dir="auto">' +
                 'Hey <span>' +
                 '<a class="mx_Pill mx_UserPill" title="@user:server">' +
-                '<img src="mxc://avatar.url/image.png" style="width: 16px; height: 16px;" ' +
-                'title="@member:domain.bla" alt="" aria-hidden="true" role="button" tabindex="0" ' +
-                'class="mx_AccessibleButton mx_BaseAvatar mx_BaseAvatar_image">Member</a>' +
+                '<img class="mx_BaseAvatar mx_BaseAvatar_image" src="mxc://avatar.url/image.png" ' +
+                'style="width: 16px; height: 16px;" title="@member:domain.bla" alt="" aria-hidden="true">Member</a>' +
                 '</span></span>');
         });
     });