diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 4a1af77739..713cdc867a 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -428,7 +428,7 @@ module.exports = createReactClass({
                         break;
                     }
 
-                    // If RM event is in the summary mark it as such and the RM will be appended after the summary.
+                    // If RM event is in the summary, mark it as such and the RM will be appended after the summary.
                     if (collapsedMxEv.getId() === this.props.readMarkerEventId) {
                         readMarkerInSummary = true;
                     }
@@ -445,22 +445,20 @@ module.exports = createReactClass({
                     return this._getTilesForEvent(e, e, e === lastShownEvent);
                 }).reduce((a, b) => a.concat(b));
 
-                if (eventTiles.length === 0) {
-                    eventTiles = null;
+                if (eventTiles.length > 0) {
+                    ret.push(<EventListSummary
+                        key="roomcreationsummary"
+                        events={summarisedEvents}
+                        onToggle={this._onHeightChanged} // Update scroll state
+                        summaryMembers={[mxEv.sender]}
+                        summaryText={_t("%(creator)s created and configured the room.", {
+                            creator: mxEv.sender ? mxEv.sender.name : mxEv.getSender(),
+                        })}
+                    >
+                        { eventTiles }
+                    </EventListSummary>);
                 }
 
-                ret.push(<EventListSummary
-                    key="roomcreationsummary"
-                    events={summarisedEvents}
-                    onToggle={this._onHeightChanged} // Update scroll state
-                    summaryMembers={[mxEv.sender]}
-                    summaryText={_t("%(creator)s created and configured the room.", {
-                        creator: mxEv.sender ? mxEv.sender.name : mxEv.getSender(),
-                    })}
-                >
-                    { eventTiles }
-                </EventListSummary>);
-
                 if (readMarkerInSummary) {
                     ret.push(this._getReadMarkerTile(visible));
                 }