diff --git a/src/Velociraptor.js b/src/Velociraptor.js
index df6b3c95dc..d973a17f7f 100644
--- a/src/Velociraptor.js
+++ b/src/Velociraptor.js
@@ -23,7 +23,7 @@ module.exports = React.createClass({
         this.nodes = {};
         var self = this;
         React.Children.map(this.props.children, function(c) {
-            self.children[c.props.key] = c;
+            self.children[c.key] = c;
         });
     },
 
diff --git a/src/skins/vector/views/molecules/EventTile.js b/src/skins/vector/views/molecules/EventTile.js
index 20d7f1ecc0..236e7b1fd8 100644
--- a/src/skins/vector/views/molecules/EventTile.js
+++ b/src/skins/vector/views/molecules/EventTile.js
@@ -70,10 +70,6 @@ module.exports = React.createClass({
         return {menu: false, allReadAvatars: false};
     },
 
-    componentDidUpdate: function() {
-        this.readAvatarNode = ReactDom.findDOMNode(this.readAvatarNode);
-    },
-
     onEditClicked: function(e) {
         var MessageContextMenu = sdk.getComponent('molecules.MessageContextMenu');
         var buttonRect = e.target.getBoundingClientRect()
@@ -209,7 +205,7 @@ module.exports = React.createClass({
     },
 
     collectReadAvatarNode: function(node) {
-        this.readAvatarNode = node;
+        this.readAvatarNode = ReactDom.findDOMNode(node);
     },
 
     render: function() {