diff --git a/src/components/views/avatars/MemberAvatar.tsx b/src/components/views/avatars/MemberAvatar.tsx
index 23bdada593..6ef08775fd 100644
--- a/src/components/views/avatars/MemberAvatar.tsx
+++ b/src/components/views/avatars/MemberAvatar.tsx
@@ -93,6 +93,7 @@ export default class MemberAvatar extends React.Component<IProps, IState> {
             };
         } else {
             logger.error("MemberAvatar called somehow with null member or fallbackUserId");
+            return {} as IState; // prevent an explosion
         }
     }