diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 4373569fd4..0d00b9afe5 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -177,11 +177,15 @@ module.exports = React.createClass({
         roomProm.then((room) => {
             this._calculatePeekRules(room);
             return this._initTimeline(this.props);
-        }).catch(() => {
-            // This is fine: the room just isn't peekable (we assume).
-            this.setState({
-                timelineLoading: false,
-            });
+        }).catch((err) => {
+            if (err.errcode == "M_GUEST_ACCESS_FORBIDDEN") {
+                // This is fine: the room just isn't peekable (we assume).
+                this.setState({
+                    timelineLoading: false,
+                });
+            } else {
+                throw err;
+            }
         }).done();
     },