diff --git a/src/components/structures/RoomDirectory.js b/src/components/structures/RoomDirectory.js
index cb77087fbb..152624dd9b 100644
--- a/src/components/structures/RoomDirectory.js
+++ b/src/components/structures/RoomDirectory.js
@@ -99,6 +99,8 @@ module.exports = React.createClass({
     },
 
     getMoreRooms: function() {
+        if (!MatrixClientPeg.get()) return q();
+
         const my_filter_string = this.filterString;
         const opts = {limit: 20};
         if (this.nextBatch) opts.since = this.nextBatch;