diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 64b3fecaab..71eb422c83 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -320,12 +320,13 @@ module.exports = React.createClass({
                         }
                     ).reduce((a,b) => a.concat(b));
                 };
+
+                let eventTiles = renderEvents(prevEvent, summarisedEvents);
+
                 ret.push(
-                    <MemberEventListSummary
-                        events={summarisedEvents}
-                        previousEvent={prevEvent}
-                        renderEvents={renderEvents}
-                    />
+                    <MemberEventListSummary events={summarisedEvents}>
+                        {eventTiles}
+                    </MemberEventListSummary>
                 );
                 prevEvent = mxEv;
                 continue;
diff --git a/src/components/views/elements/MemberEventListSummary.js b/src/components/views/elements/MemberEventListSummary.js
index d753fcc007..c0034bf264 100644
--- a/src/components/views/elements/MemberEventListSummary.js
+++ b/src/components/views/elements/MemberEventListSummary.js
@@ -180,7 +180,7 @@ module.exports = React.createClass({
         let expandedEvents = null;
 
         if (expanded) {
-            expandedEvents = this.props.renderEvents(this.props.previousEvent, eventsToRender);
+            expandedEvents = this.props.children;
         }
 
         let avatars = this.renderAvatars(joinEvents.concat(leaveEvents));