diff --git a/matrix/buffer.py b/matrix/buffer.py
index dd89c4c..5caa7f2 100644
--- a/matrix/buffer.py
+++ b/matrix/buffer.py
@@ -1166,7 +1166,7 @@ class RoomBuffer(object):
 
         if room_name is None:
             # Use placeholder room name
-            room_name = '...'
+            room_name = 'Empty room (?)'
 
         self.weechat_buffer.short_name = room_name