diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index 6eb1599147..7f18589ba0 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -747,6 +747,7 @@ const TimelinePanel = React.createClass({
         const lastDisplayedIndex = this._getLastDisplayedEventIndex({
             allowPartial: true,
             ignoreEchoes: true,
+            allowEventsWithoutTiles: true,
         });
 
         if (lastDisplayedIndex === null) {