diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index d105610dd5..807eae5dc6 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -47,11 +47,6 @@ module.exports = React.createClass({
         // for more details.
         stickyBottom: React.PropTypes.bool,
 
-        // callback to determine if a user is the magic freeswitch conference
-        // user. Takes one parameter, which is a user id. Should return true if
-        // the user is the conference user.
-        isConferenceUser: React.PropTypes.func,
-
         // callback which is called when the panel is scrolled.
         onScroll: React.PropTypes.func,
 
@@ -140,13 +135,6 @@ module.exports = React.createClass({
                 continue;
             }
 
-            if (this.props.isConferenceUser && mxEv.getType() === "m.room.member") {
-                if (this.props.isConferenceUser(mxEv.getSender()) ||
-                        this.props.isConferenceUser(mxEv.getStateKey())) {
-                    continue; // suppress conf user join/parts
-                }
-            }
-            
             break;
         }
         var lastShownEventIndex = i;
@@ -167,13 +155,6 @@ module.exports = React.createClass({
                 wantTile = false;
             }
 
-            if (this.props.isConferenceUser && mxEv.getType() === "m.room.member") {
-                if (this.props.isConferenceUser(mxEv.getSender()) ||
-                        this.props.isConferenceUser(mxEv.getStateKey())) {
-                    wantTile = false; // suppress conf user join/parts
-                }
-            }
-
             var last = (i == lastShownEventIndex);
 
             if (wantTile) {
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index d3aabf366f..934f6b6b51 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -1265,9 +1265,6 @@ module.exports = React.createClass({
                 highlightedEventId={this.props.highlightedEventId}
                 eventId={this.props.eventId}
                 eventPixelOffset={this.props.eventPixelOffset}
-                isConferenceUser={this.props.ConferenceHandler ?
-                                  this.props.ConferenceHandler.isConferenceUser :
-                                  null }
                 onScroll={ this.onMessageListScroll }
             />);
 
diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index ae5db3a36a..ba67d3cd43 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -67,11 +67,6 @@ module.exports = React.createClass({
         // middle of the viewprt.
         eventPixelOffset: React.PropTypes.number,
 
-        // callback to determine if a user is the magic freeswitch conference
-        // user. Takes one parameter, which is a user id. Should return true if
-        // the user is the conference user.
-        isConferenceUser: React.PropTypes.func,
-
         // callback which is called when the panel is scrolled.
         onScroll: React.PropTypes.func,
     },
@@ -455,7 +450,6 @@ module.exports = React.createClass({
                     suppressFirstDateSeparator={ this.state.canBackPaginate }
                     ourUserId={ MatrixClientPeg.get().credentials.userId }
                     stickyBottom={ stickyBottom }
-                    isConferenceUser={ this.props.isConferenceUser }
                     onScroll={ this.props.onScroll }
                     onFillRequest={ this.onMessageListFillRequest }
             />