diff --git a/Riot/Model/Room/RoomPreviewData.m b/Riot/Model/Room/RoomPreviewData.m
index d42f38e43..a2f95109d 100644
--- a/Riot/Model/Room/RoomPreviewData.m
+++ b/Riot/Model/Room/RoomPreviewData.m
@@ -58,6 +58,12 @@
         _roomTopic = publicRoom.topic;
         _roomAliases = publicRoom.aliases;
         _numJoinedMembers = publicRoom.numJoinedMembers;
+        
+        if (!_roomName.length)
+        {
+            // Consider the room aliases to define a default room name.
+            _roomName = _roomAliases.firstObject;
+        }
     }
     return self;
 }