diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index c358ef610d..22c3136737 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -745,14 +745,26 @@ export default class EventTile extends React.Component {
         }
 
         if (this.props.mxEvent.sender && avatarSize) {
-            avatar = (
+            if(this.props.mxEvent.getType()==='m.room.third_party_invite') {
+                avatar = (
                     <div className="mx_EventTile_avatar">
-                        <MemberAvatar member={this.props.mxEvent.sender}
+                        <MemberAvatar member={this.props.mxEvent.target}
                             width={avatarSize} height={avatarSize}
                             viewUserOnClick={true}
                         />
                     </div>
-            );
+                );
+            }
+            else {
+                avatar = (
+                        <div className="mx_EventTile_avatar">
+                            <MemberAvatar member={this.props.mxEvent.sender}
+                                width={avatarSize} height={avatarSize}
+                                viewUserOnClick={true}
+                            />
+                        </div>
+                );
+            }
         }
 
         if (needsSenderProfile) {