diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index a46efc8025..3fbcf80805 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -586,8 +586,7 @@ module.exports = React.createClass({
         Presence.start();
         cli.startClient({
             pendingEventOrdering: "end",
-            // deliberately huge limit for now to avoid hitting gappy /sync's until gappy /sync performance improves
-            initialSyncLimit: 250,
+            initialSyncLimit: 20,
         });
     },