diff --git a/lib/models/room.js b/lib/models/room.js
index 29072da6f..d6e19aa2a 100644
--- a/lib/models/room.js
+++ b/lib/models/room.js
@@ -711,7 +711,7 @@ function calculateRoomName(room, userId, ignoreRoomNameEvent) {
             return (m.membership !== "leave");
         });
         if (memberList.length === 1) {
-            // we exist, but no one else... self-chat or invite.
+            // self-chat, peeked room with 1 participant, or invite.
             if (memberList[0].membership === "invite") {
                 if (memberList[0].events.member) {
                     // extract who invited us to the room
@@ -722,7 +722,12 @@ function calculateRoomName(room, userId, ignoreRoomNameEvent) {
                 }
             }
             else {
-                return memberList[0].name;
+                if (memberList[0].userId === userId) {
+                    return "Empty room"
+                }
+                else {
+                    return memberList[0].name;
+                }
             }
         }
         else {