diff --git a/matrix/buffer.py b/matrix/buffer.py
index 793ef15..dd89c4c 100644
--- a/matrix/buffer.py
+++ b/matrix/buffer.py
@@ -1164,6 +1164,10 @@ class RoomBuffer(object):
         else:
             room_name = self.room.display_name
 
+        if room_name is None:
+            # Use placeholder room name
+            room_name = '...'
+
         self.weechat_buffer.short_name = room_name
 
         if G.CONFIG.human_buffer_names: