diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index b4da948852..8a0f36e483 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -596,7 +596,7 @@ module.exports = React.createClass({
         Presence.start();
         cli.startClient({
             pendingEventOrdering: "end",
-            initialSyncLimit: 20,
+            initialSyncLimit: this.props.config.sync_timeline_limit || 20,
         });
     },