diff --git a/templates/partials/chat_dropdown.tpl b/templates/partials/chat_dropdown.tpl
index 038c9de..b2afef5 100644
--- a/templates/partials/chat_dropdown.tpl
+++ b/templates/partials/chat_dropdown.tpl
@@ -1,7 +1,7 @@
 <!-- IF rooms.length -->
 <!-- BEGIN rooms -->
 <li class="<!-- IF ../unread -->unread<!-- ENDIF ../unread -->" data-roomid="{rooms.roomId}">
-	<a data-ajaxify="false">{rooms.roomName}</a>
+	<a data-ajaxify="false"><!-- IF rooms.roomName -->{rooms.roomName}<!-- ELSE -->{rooms.usernames}<!-- ENDIF rooms.roomName --></a>
 
 	<ul class="members">
 		<!-- BEGIN rooms.users -->
diff --git a/templates/partials/chat_recent_room.tpl b/templates/partials/chat_recent_room.tpl
index 035cc7b..94cb96f 100644
--- a/templates/partials/chat_recent_room.tpl
+++ b/templates/partials/chat_recent_room.tpl
@@ -1,7 +1,7 @@
 <li component="chat/recent/room" data-roomid="{rooms.roomId}" class="<!-- IF rooms.unread -->unread<!-- ENDIF rooms.unread -->">
 	<i class="fa fa-times pull-right leave" component="chat/leave"></i>
 	<div>
-		<p>{rooms.roomName}</p>
+		<p><!-- IF rooms.roomName -->{rooms.roomName}<!-- ELSE -->{rooms.usernames}<!-- ENDIF rooms.roomName --></p>
 		<ul class="members">
 			<!-- BEGIN rooms.users -->
 			<li>