diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index 5c0a6159e5..cb42f701a3 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -993,7 +993,7 @@ var TimelinePanel = React.createClass({
             );
         }
 
-        if (this.state.events.length == 0) {
+        if (this.state.events.length == 0 && !this.state.canBackPaginate && this.props.empty) {
             return (
                     <div className={ this.props.className + " mx_RoomView_messageListWrapper" }>
                         <div className="mx_RoomView_empty">{ this.props.empty }</div>