diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 76a79bec03..8687cb444c 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -1258,8 +1258,10 @@ module.exports = React.createClass({
 
         var messagePanel = (
             <TimelinePanel ref={(r) => {
-                        this.refs.messagePanel = r;
+                    this.refs.messagePanel = r;
+                    if(r) {
                         this.updateTint();
+                    }
                 }}
                 room={this.state.room}
                 hidden={hideMessagePanel}