diff --git a/lib/models/room.js b/lib/models/room.js
index 4c82f20a2..29072da6f 100644
--- a/lib/models/room.js
+++ b/lib/models/room.js
@@ -722,7 +722,7 @@ function calculateRoomName(room, userId, ignoreRoomNameEvent) {
                 }
             }
             else {
-                return memberList[0].name || userId;
+                return memberList[0].name;
             }
         }
         else {