diff --git a/src/Rooms.js b/src/Rooms.js
index ffa39141ff..607bd60b98 100644
--- a/src/Rooms.js
+++ b/src/Rooms.js
@@ -81,8 +81,7 @@ export function isConfCallRoom(room, me, conferenceHandler) {
 }
 
 export function looksLikeDirectMessageRoom(room, me) {
-    if (me.membership == "join" || me.membership === "ban" ||
-        (me.membership === "leave" && me.events.member.getSender() !== me.events.member.getStateKey())) {
+    if (me.membership == "join" || me.membership === "ban" || me.isKicked()) {
         // Used to split rooms via tags
         const tagNames = Object.keys(room.tags);
         // Used for 1:1 direct chats
diff --git a/src/stores/RoomListStore.js b/src/stores/RoomListStore.js
index b6d0949dd3..8dbfca8875 100644
--- a/src/stores/RoomListStore.js
+++ b/src/stores/RoomListStore.js
@@ -178,8 +178,7 @@ class RoomListStore extends Store {
 
             if (me.membership == "invite") {
                 lists["im.vector.fake.invite"].push(room);
-            } else if (me.membership == "join" || me.membership === "ban" ||
-                     (me.membership === "leave" && me.events.member.getSender() !== me.events.member.getStateKey())) {
+            } else if (me.membership == "join" || me.membership === "ban" || me.isKicked()) {
                 // Used to split rooms via tags
                 let tagNames = Object.keys(room.tags);