diff --git a/matrix/utils.py b/matrix/utils.py
index 6de391d..3da8fa1 100644
--- a/matrix/utils.py
+++ b/matrix/utils.py
@@ -136,7 +136,8 @@ def sender_to_nick_and_color(room, sender):
 
     if sender in room.users:
         user = room.users[sender]
-        nick = user.display_name
+        nick = (user.display_name if user.display_name
+                else user.name)
         nick_color_name = user.nick_color
     else:
         nick = shorten_sender(sender)