diff --git a/examples/node/app.js b/examples/node/app.js
index dcff22aac..fd486830b 100644
--- a/examples/node/app.js
+++ b/examples/node/app.js
@@ -202,9 +202,9 @@ function printRoomList() {
             dateStr = new Date(msg.getTs()).toISOString().replace(
                 /T/, ' ').replace(/\..+/, '');
         }
-        var me = roomList[i].getMember(myUserId);
-        if (me) {
-            fmt = fmts[me.membership];
+        var myMembership = roomList[i].getMyMembership();
+        if (myMembership) {
+            fmt = fmts[myMembership];
         }
         var roomName = fixWidth(roomList[i].name, 25);
         print(
diff --git a/src/crypto/index.js b/src/crypto/index.js
index 4a9cbf7eb..273dcce70 100644
--- a/src/crypto/index.js
+++ b/src/crypto/index.js
@@ -1008,14 +1008,8 @@ Crypto.prototype._getE2eRooms = function() {
         }
 
         // ignore any rooms which we have left
-        const me = room.getMember(this._userId);
-        if (!me || (
-            me.membership !== "join" && me.membership !== "invite"
-        )) {
-            return false;
-        }
-
-        return true;
+        const myMembership = room.getMyMembership();
+        return myMembership === "join" || myMembership === "invite";
     });
 };