diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 1107be8464..5fe2aae471 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -664,6 +664,11 @@ module.exports = React.createClass({
             },
         );
 
+        let whoIsTyping;
+        if (this.props.room) {
+            whoIsTyping = (<WhoIsTypingTile room={this.props.room} onVisible={this._scrollDownIfAtBottom} />);
+        }
+
         return (
             <ScrollPanel ref="scrollPanel" className={className}
                     onScroll={this.props.onScroll}
@@ -674,7 +679,7 @@ module.exports = React.createClass({
                     stickyBottom={this.props.stickyBottom}>
                 { topSpinner }
                 { this._getEventTiles() }
-                <WhoIsTypingTile room={this.props.room} onVisible={this._scrollDownIfAtBottom} />
+                { whoIsTyping }
                 { bottomSpinner }
             </ScrollPanel>
         );