diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index b5df6b2e82..8477a5f4d3 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -607,6 +607,12 @@ module.exports = React.createClass({
             if (!EventTile.haveTileForEvent(mxEv)) {
                 continue;
             }
+            if (this.props.ConferenceHandler && mxEv.getType() === "m.room.member") {
+                if (this.props.ConferenceHandler.isConferenceUser(mxEv.getSender()) ||
+                        this.props.ConferenceHandler.isConferenceUser(mxEv.getStateKey())) {
+                    continue; // suppress conf user join/parts
+                }
+            }
 
             var continuation = false;
             var last = false;
diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index 576c5ee0cf..a89dd55f1a 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -182,7 +182,7 @@ module.exports = React.createClass({
                             return m.userId !== me.userId
                         })[0];
                         var ConfHandler = self.props.ConferenceHandler;
-                        if (ConfHandler && ConfHandler.isConferenceUser(otherMember)) {
+                        if (ConfHandler && ConfHandler.isConferenceUser(otherMember.userId)) {
                             // console.log("Hiding conference 1:1 room %s", room.roomId);
                             shouldShowRoom = false;
                         }