diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 947ff7cb4e..91d1918c0f 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -678,7 +678,7 @@ module.exports = React.createClass({
             // if this is an invite and has the 'direct' hint set, mark it as a DM room now.
             if (this.state.room) {
                 const me = this.state.room.getMember(MatrixClientPeg.get().credentials.userId);
-                if (me.membership == 'invite') {
+                if (me && me.membership == 'invite') {
                     // The 'direct' hihnt is there, so declare that this is a DM room for
                     // whoever invited us.
                     if (me.events.member.getContent().is_direct) {