diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9086006376..e673b18f99 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+Changes in <unreleased>
+=======================
+ * Reduce number of events shown in a room to 250, to improve responsiveness
+
 Changes in [0.5.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.5.1) (2016-04-19)
 ===================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.4.0...v0.5.1)
diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index 1f7c98b0b1..289dd4be25 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -31,7 +31,7 @@ var KeyCode = require('../../KeyCode');
 
 var PAGINATE_SIZE = 20;
 var INITIAL_SIZE = 20;
-var TIMELINE_CAP = 500; // the most events to show in a timeline
+var TIMELINE_CAP = 250; // the most events to show in a timeline
 
 var DEBUG = false;