diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 5135936a28..08bed976cc 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -758,16 +758,13 @@ module.exports = React.createClass({
     },
 
     _updateDMState() {
-        const me = this.state.room.getMember(MatrixClientPeg.get().getUserId());
         const room = this.state.room;
         if (room.getMyMembership() != "join") {
             return;
         }
-        const roomId = this.state.room.roomId;
-        const dmInviter = me.getDMInviter();
-
+        const dmInviter = room.getDMInviter();
         if (dmInviter) {
-            Rooms.setDMRoom(roomId, dmInviter);
+            Rooms.setDMRoom(room.roomId, dmInviter);
         }
     },