diff --git a/src/organisms/RoomView.js b/src/organisms/RoomView.js
index 0f4ef1a1c3..4a682c8b6d 100644
--- a/src/organisms/RoomView.js
+++ b/src/organisms/RoomView.js
@@ -36,7 +36,7 @@ module.exports = React.createClass({
     getMessageTiles: function() {
         return this.state.room.timeline.map(function(mxEv) {
             return (
-                <li><MessageTile mxEvent={mxEv} key={mxEv.getId()} /></li>
+                <li key={mxEv.getId()}><MessageTile mxEvent={mxEv} /></li>
             );
         });
     },