diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index 122737ed52..47ad89c75b 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -92,7 +92,7 @@ var TimelinePanel = React.createClass({
         timelineCap: React.PropTypes.number,
 
         // classname to use for the messagepanel
-        className: React.PropTypes.string.isRequired,
+        className: React.PropTypes.string,
     },
 
     statics: {
@@ -106,6 +106,7 @@ var TimelinePanel = React.createClass({
     getDefaultProps: function() {
         return {
             timelineCap: 250,
+            className: 'mx_RoomView_messagePanel',
         };
     },
 
diff --git a/test/components/structures/TimelinePanel-test.js b/test/components/structures/TimelinePanel-test.js
index 4683637a1b..c2bb616b0d 100644
--- a/test/components/structures/TimelinePanel-test.js
+++ b/test/components/structures/TimelinePanel-test.js
@@ -61,10 +61,10 @@ describe('TimelinePanel', function() {
 
         timeline = new jssdk.EventTimeline(ROOM_ID);
         room = sinon.createStubInstance(jssdk.Room);
-        room.getPendingEvents.returns([]);
 
         timelineSet = sinon.createStubInstance(jssdk.EventTimelineSet);
         timelineSet.getLiveTimeline.returns(timeline);
+        timelineSet.getPendingEvents.returns([]);
         timelineSet.room = room;
 
         client = peg.get();